Skip to content

Commit

Permalink
Update file copyright headers
Browse files Browse the repository at this point in the history
  • Loading branch information
fspindle committed Jun 29, 2023
1 parent 7af5667 commit 42a9c1f
Show file tree
Hide file tree
Showing 1,142 changed files with 4,322 additions and 6,075 deletions.
7 changes: 2 additions & 5 deletions CTestConfig.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#############################################################################
#
# ViSP, open source Visual Servoing Platform software.
# Copyright (C) 2005 - 2019 by Inria. All rights reserved.
# Copyright (C) 2005 - 2023 by Inria. All rights reserved.
#
# This software is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
# GPL, please contact Inria about acquiring a ViSP Professional
# Edition License.
#
# See http://visp.inria.fr for more information.
# See https://visp.inria.fr for more information.
#
# This software was developed at:
# Inria Rennes - Bretagne Atlantique
Expand All @@ -31,9 +31,6 @@
# Description:
# CDash configuration.
#
# Authors:
# Fabien Spindler
#
#############################################################################

set(CTEST_PROJECT_NAME "ViSP")
Expand Down
3 changes: 2 additions & 1 deletion ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

ViSP 3.5.1 (under development)
- Contributors:
. Fabien Spindler, Souriya Trinh, Romain Lagneau, Antonio Marino, Samuel Felton
. Fabien Spindler, Souriya Trinh, Romain Lagneau, Antonio Marino, Samuel Felton,
Francois Chaumette
- New features and improvements
. Video writer is now able to create the output folder recursively (see vpVideoWriter)
. Introduce Universal Robots support with new vpRobotUniversalRobots class that
Expand Down
16 changes: 8 additions & 8 deletions INSTALL.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ViSP
Visual Servoing Platform

Copyright (C) 2005 - 2021 by Inria. All rights reserved.
Copyright (C) 2005 - 2023 by Inria. All rights reserved.
https://visp.inria.fr



INSTALL howto for the ViSP library

QUICKINSTALL:
QUICKINSTALL:
> get ViSP source
> install CMake (see http://www.cmake.org)
> cmake .
Expand All @@ -22,13 +22,13 @@ projects. To do the installation, you don't need to be root.
Building ViSP with CMake
------------------------

Prerequsits:
Prerequsits:
(1) Install newest cmake release from http://www.cmake.org

(2) checkout/install ViSP source code.

(3) configure
run cmake to change options and to generate makefiles.
(3) configure
run cmake to change options and to generate makefiles.

example for a build on Linux:
cd to source directory of ViSP
Expand All @@ -42,11 +42,11 @@ See the bottom line for usage instructions, in particular:
- finally press 'g' to generate Makefiles

On Win32:
> CMakeSetup.exe
> CMakeSetup.exe
The GUI is self-explaining.

Note:
You can also use
You can also use
> cmake .
directly if you prefer command line instead of graphical interface.

Expand All @@ -64,7 +64,7 @@ Copy visp-config shell script in ${CMAKE_INSTALL_PREFIX}/bin
> make uninstall
Dual from install.
Remove headers in ${CMAKE_INSTALL_PREFIX}/include
Remove library and cmake files in ${CMAKE_INSTALL_PREFIX}/lib
Remove library and cmake files in ${CMAKE_INSTALL_PREFIX}/lib
Remove visp-config shell script in ${CMAKE_INSTALL_PREFIX}/bin

(7) clean:
Expand Down
7 changes: 2 additions & 5 deletions cmake/AddExtraCompilationFlags.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#############################################################################
#
# ViSP, open source Visual Servoing Platform software.
# Copyright (C) 2005 - 2019 by Inria. All rights reserved.
# Copyright (C) 2005 - 2023 by Inria. All rights reserved.
#
# This software is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
# GPL, please contact Inria about acquiring a ViSP Professional
# Edition License.
#
# See http://visp.inria.fr for more information.
# See https://visp.inria.fr for more information.
#
# This software was developed at:
# Inria Rennes - Bretagne Atlantique
Expand All @@ -31,9 +31,6 @@
# Description:
# ViSP overall configuration file. Add extra compilation flags.
#
# Authors:
# Fabien Spindler
#
#############################################################################

# Warning: here ViSPDetectPlatform.cmake should be called before this file to set ARM var used below
Expand Down
9 changes: 3 additions & 6 deletions cmake/CPackConfig.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#############################################################################
#
# ViSP, open source Visual Servoing Platform software.
# Copyright (C) 2005 - 2019 by Inria. All rights reserved.
# Copyright (C) 2005 - 2023 by Inria. All rights reserved.
#
# This software is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
# GPL, please contact Inria about acquiring a ViSP Professional
# Edition License.
#
# See http://visp.inria.fr for more information.
# See https://visp.inria.fr for more information.
#
# This software was developed at:
# Inria Rennes - Bretagne Atlantique
Expand All @@ -31,9 +31,6 @@
# Description:
# ViSP packaging configuration file.
#
# Authors:
# Fabien Spindler
#
#############################################################################


Expand All @@ -60,7 +57,7 @@ SET(CPACK_COMPONENT_LIBRARIES_DESCRIPTION "ViSP ${VISP_VERSION} libraries")
SET(CPACK_COMPONENT_HEADERS_DESCRIPTION "C/C++ header files for use with ViSP ${VISP_VERSION} libraries")
SET(CPACK_COMPONENT_HEADERS_DEPENDS libraries)
SET(CPACK_COMPONENT_LIBRARIES_GROUP "Development")
SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "All of the tools you'll ever need to develop software with ViSP")
SET(CPACK_ALL_INSTALL_TYPES Full Developer)
SET(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Developer Full)
Expand Down
7 changes: 2 additions & 5 deletions cmake/CPackConfigDeb.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#############################################################################
#
# ViSP, open source Visual Servoing Platform software.
# Copyright (C) 2005 - 2019 by Inria. All rights reserved.
# Copyright (C) 2005 - 2023 by Inria. All rights reserved.
#
# This software is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
# GPL, please contact Inria about acquiring a ViSP Professional
# Edition License.
#
# See http://visp.inria.fr for more information.
# See https://visp.inria.fr for more information.
#
# This software was developed at:
# Inria Rennes - Bretagne Atlantique
Expand All @@ -31,9 +31,6 @@
# Description:
# ViSP packaging configuration file.
#
# Authors:
# Fabien Spindler
#
#############################################################################


Expand Down
7 changes: 2 additions & 5 deletions cmake/CPackConfigNsis.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#############################################################################
#
# ViSP, open source Visual Servoing Platform software.
# Copyright (C) 2005 - 2019 by Inria. All rights reserved.
# Copyright (C) 2005 - 2023 by Inria. All rights reserved.
#
# This software is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
# GPL, please contact Inria about acquiring a ViSP Professional
# Edition License.
#
# See http://visp.inria.fr for more information.
# See https://visp.inria.fr for more information.
#
# This software was developed at:
# Inria Rennes - Bretagne Atlantique
Expand All @@ -31,9 +31,6 @@
# Description:
# ViSP packaging configuration file.
#
# Authors:
# Fabien Spindler
#
#############################################################################

set(BUILD_SHARED_LIBS CACHE FORCE "Build ViSP with shared libraries." ON)
Expand Down
9 changes: 3 additions & 6 deletions cmake/CPackConfigRpm.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#############################################################################
#
# ViSP, open source Visual Servoing Platform software.
# Copyright (C) 2005 - 2019 by Inria. All rights reserved.
# Copyright (C) 2005 - 2023 by Inria. All rights reserved.
#
# This software is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
# GPL, please contact Inria about acquiring a ViSP Professional
# Edition License.
#
# See http://visp.inria.fr for more information.
# See https://visp.inria.fr for more information.
#
# This software was developed at:
# Inria Rennes - Bretagne Atlantique
Expand All @@ -31,9 +31,6 @@
# Description:
# ViSP packaging configuration file.
#
# Authors:
# Fabien Spindler
#
#############################################################################


Expand All @@ -52,7 +49,7 @@ ELSE()
ENDIF()

# create a fedora short name from cat /etc/fedora-release
# for example, cat .. return "Fedora release 13 (Goddard)" we build "fc13"
# for example, cat .. return "Fedora release 13 (Goddard)" we build "fc13"
FIND_PROGRAM(CAT_CMD cat)
MARK_AS_ADVANCED(CAT_CMD)
IF(NOT CAT_CMD)
Expand Down
27 changes: 12 additions & 15 deletions cmake/FindARIA.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#############################################################################
#
# ViSP, open source Visual Servoing Platform software.
# Copyright (C) 2005 - 2019 by Inria. All rights reserved.
# Copyright (C) 2005 - 2023 by Inria. All rights reserved.
#
# This software is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
# GPL, please contact Inria about acquiring a ViSP Professional
# Edition License.
#
# See http://visp.inria.fr for more information.
# See https://visp.inria.fr for more information.
#
# This software was developed at:
# Inria Rennes - Bretagne Atlantique
Expand All @@ -30,15 +30,12 @@
#
# Description:
# Try to find Aria libraries and headers to control Pioneer mobile robots.
# Once run this will define:
# Once run this will define:
#
# ARIA_FOUND
# ARIA_INCLUDE_DIRS
# ARIA_LIBRARIES
#
# Authors:
# Fabien Spindler
#
#############################################################################

find_path(ARIA_INCLUDE_DIR Aria.h
Expand All @@ -51,12 +48,12 @@ find_path(ARIA_INCLUDE_DIR Aria.h
/usr/local/include/Aria
"C:/Program Files/MobileRobots/Aria/include"
)
#MESSAGE("DBG ARIA_INCLUDE_DIR=${ARIA_INCLUDE_DIR}")
#MESSAGE("DBG ARIA_INCLUDE_DIR=${ARIA_INCLUDE_DIR}")

if(UNIX)
if(UNIX)
find_library(ARIA_LIBRARY
NAMES Aria
PATHS
PATHS
$ENV{ARIA_HOME}/lib
/usr/local/Aria/lib
/usr/Aria/lib
Expand All @@ -80,7 +77,7 @@ else()
else()
set(ARIA_SUFFIX_NAME "")
endif()

set(ARIA_LIB_SEARCH_PATH "")
if(CMAKE_CL_64)
list(APPEND ARIA_LIB_SEARCH_PATH "C:/Program Files/MobileRobots/Aria/lib64")
Expand All @@ -92,17 +89,17 @@ else()

find_library(ARIA_LIBRARY_DEBUG
NAMES AriaDebug${ARIA_SUFFIX_NAME}
PATHS
PATHS
${ARIA_LIB_SEARCH_PATH}
)
find_library(ARIA_LIBRARY_RELEASE
NAMES Aria${ARIA_SUFFIX_NAME}
PATHS
PATHS
${ARIA_LIB_SEARCH_PATH}
)
endif()
if(UNIX)

if(UNIX)
if(ARIA_LIBRARY AND ARIA_INCLUDE_DIR)
set(ARIA_INCLUDE_DIRS ${ARIA_INCLUDE_DIR})
set(ARIA_LIBRARIES ${ARIA_LIBRARY})
Expand All @@ -124,7 +121,7 @@ else()
endif()

endif()

mark_as_advanced(
ARIA_INCLUDE_DIR
ARIA_LIBRARY
Expand Down
7 changes: 2 additions & 5 deletions cmake/FindARSDK.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#############################################################################
#
# ViSP, open source Visual Servoing Platform software.
# Copyright (C) 2005 - 2019 by Inria. All rights reserved.
# Copyright (C) 2005 - 2023 by Inria. All rights reserved.
#
# This software is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
# GPL, please contact Inria about acquiring a ViSP Professional
# Edition License.
#
# See http://visp.inria.fr for more information.
# See https://visp.inria.fr for more information.
#
# This software was developed at:
# Inria Rennes - Bretagne Atlantique
Expand All @@ -36,9 +36,6 @@
# BICLOPS_INCLUDE_DIRS
# BICLOPS_LIBRARIES
#
# Authors:
# Fabien Spindler
#
#############################################################################

find_path(ARSDK_INCLUDE_DIR libARCommands/ARCommands.h
Expand Down
Loading

0 comments on commit 42a9c1f

Please sign in to comment.