diff --git a/CMakeLists.txt b/CMakeLists.txt index 4789c8db78..6635e2b875 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) endif() -cmake_minimum_required(VERSION 3.5) # needs to be before project() for policy CMP0025 +cmake_minimum_required(VERSION 3.10) # needs to be before project() for policy CMP0025 # Detect if the toolchain is for Aldebaran naoqi if(CMAKE_TOOLCHAIN_FILE AND I_AM_A_ROBOT) diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 9005d98da6..2737090285 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(ViSP-apps) diff --git a/apps/calibration/CMakeLists.txt b/apps/calibration/CMakeLists.txt index f3dce0c0b1..952dacffee 100644 --- a/apps/calibration/CMakeLists.txt +++ b/apps/calibration/CMakeLists.txt @@ -1,6 +1,6 @@ project(apps-calibration) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_vision visp_io OPTIONAL_COMPONENTS visp_gui visp_robot visp_sensor) diff --git a/cmake/VISPGenerateConfigScript.cmake b/cmake/VISPGenerateConfigScript.cmake index 04489e5dce..ad3a4b944d 100644 --- a/cmake/VISPGenerateConfigScript.cmake +++ b/cmake/VISPGenerateConfigScript.cmake @@ -256,7 +256,7 @@ set(TARGET_LOCATION_${item} \"${item}${VISP_VERSION_MAJOR}${VISP_VERSION_MINOR}$ # ============================================================================= else() # DEFINED CMAKE_HELPER_SCRIPT - cmake_minimum_required(VERSION 3.5) + cmake_minimum_required(VERSION 3.10) include("${CMAKE_HELPER_SCRIPT}") include("${VISP_SOURCE_DIR}/cmake/VISPUtils.cmake") diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt index ed09ecfc80..e05c66fbc8 100644 --- a/demo/CMakeLists.txt +++ b/demo/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(ViSP-demo) diff --git a/demo/wireframe-simulator/CMakeLists.txt b/demo/wireframe-simulator/CMakeLists.txt index 1744567e5e..e1e4384292 100644 --- a/demo/wireframe-simulator/CMakeLists.txt +++ b/demo/wireframe-simulator/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(demo-wireframe-simulator) diff --git a/doc/tutorial/bridge/matlab/tutorial-visp-matlab.dox b/doc/tutorial/bridge/matlab/tutorial-visp-matlab.dox index 533ea4c73d..d62dbc583e 100644 --- a/doc/tutorial/bridge/matlab/tutorial-visp-matlab.dox +++ b/doc/tutorial/bridge/matlab/tutorial-visp-matlab.dox @@ -29,7 +29,7 @@ In order to build a source code that mix ViSP and MATLAB you should first create find ViSP and MATLAB. In the following example we consider the case of the tutorial-matlab.cpp source file. \code -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(visp-matlab) diff --git a/doc/tutorial/developper/tutorial-add-new-dependency.dox b/doc/tutorial/developper/tutorial-add-new-dependency.dox index 58fba970db..bde5860939 100644 --- a/doc/tutorial/developper/tutorial-add-new-dependency.dox +++ b/doc/tutorial/developper/tutorial-add-new-dependency.dox @@ -305,7 +305,7 @@ $ more CMakeLists.txt \code project(example-dummy) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_robot) @@ -409,7 +409,7 @@ $ cd $VISP_WS/my-project $ more CMakeLists.txt \endcode \code -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-dummy) diff --git a/doc/tutorial/rendering/tutorial-panda3d.dox b/doc/tutorial/rendering/tutorial-panda3d.dox index 187031498a..ce2e939217 100644 --- a/doc/tutorial/rendering/tutorial-panda3d.dox +++ b/doc/tutorial/rendering/tutorial-panda3d.dox @@ -34,6 +34,7 @@ vpPanda3DBaseRenderer, which implements basic functions for a panda renderer. - Hereafter you will find the instructions to build and install Panda3D from source on Ubuntu 22.04 \code{.sh} + $ sudo apt install python3-pip $ mkdir -p $VISP_WS/3rdparty/panda3d $ cd $VISP_WS/3rdparty/panda3d $ git clone https://github.com/panda3d/panda3d diff --git a/doc/tutorial/started/tutorial-getting-started.dox b/doc/tutorial/started/tutorial-getting-started.dox index 023ef4c227..2bdc0d94ee 100644 --- a/doc/tutorial/started/tutorial-getting-started.dox +++ b/doc/tutorial/started/tutorial-getting-started.dox @@ -228,7 +228,7 @@ example. A minimalistic `CMakeLists.txt` should contain the following lines. Open your editor and copy/paste the following lines in `VISP_WS/started/CMakeLists.txt` file. \code -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-image) @@ -248,7 +248,7 @@ The `find_package()` CMake command searches for a `VISPConfig.cmake` file that w Note that the previous `CMakeLists.txt` file can also be: \code -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-image) diff --git a/doc/tutorial/supported-third-parties/supported-third-parties.dox b/doc/tutorial/supported-third-parties/supported-third-parties.dox index eb05985efb..be7fa1c1f4 100644 --- a/doc/tutorial/supported-third-parties/supported-third-parties.dox +++ b/doc/tutorial/supported-third-parties/supported-third-parties.dox @@ -115,6 +115,34 @@ $ sudo apt-get install libpng-dev $ su -c "yum install libpng-devel" \endverbatim +\section soft_ar 3D Rendering and Augmented Reality + +These are the optional 3rd-parties supported by ViSP in \ref module_ar for 3D Rendering and Augmented Reality. + +\subsection soft_ar_Ogre3D Ogre3D + +- Ubuntu or debian installation since Ubuntu 24.04 +\code{.sh} +$ sudo apt-get install libogre-1.12-dev libois-dev +\endcode +- Ubuntu or debian installation for Ubuntu 22.04 or before +\code{.sh} +$ sudo apt-get install libogre-1.9-dev libois-dev +\endcode +- Fedora or RedHat installation +\code{.sh} +$ su -c "yum install ogre-devel ogre-samples ois-devel" +\endcode + +\subsection soft_ar_Panda3D Panda3D + +Panda3D installation instructions are provided in \ref tutorial-panda3d. +- \ref tutorial-panda3d-install-ubuntu + +- \ref tutorial-panda3d-install-macos + +- \ref tutorial-panda3d-install-windows + \section soft_robot Robot Control The following optional third-parties are used in \ref module_robot to enable the robot arms usage supported by ViSP. diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 5e53d521a9..0e3bc34df3 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(ViSP-examples) diff --git a/example/calibration/CMakeLists.txt b/example/calibration/CMakeLists.txt index 13e257985e..5269a69ac4 100644 --- a/example/calibration/CMakeLists.txt +++ b/example/calibration/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-calibration) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_vision visp_gui visp_io) diff --git a/example/coin-simulator/CMakeLists.txt b/example/coin-simulator/CMakeLists.txt index 09e3202b93..efce508197 100644 --- a/example/coin-simulator/CMakeLists.txt +++ b/example/coin-simulator/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-coin-simulator) diff --git a/example/device/display/CMakeLists.txt b/example/device/display/CMakeLists.txt index a0e447a69d..1d8cbc60fc 100644 --- a/example/device/display/CMakeLists.txt +++ b/example/device/display/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-device-display) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_gui visp_io) diff --git a/example/device/framegrabber/CMakeLists.txt b/example/device/framegrabber/CMakeLists.txt index 49f1f039e5..ac80e54b4e 100644 --- a/example/device/framegrabber/CMakeLists.txt +++ b/example/device/framegrabber/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-device-framegrabber) diff --git a/example/device/kinect/CMakeLists.txt b/example/device/kinect/CMakeLists.txt index f3e0b1ca70..93cb732b28 100644 --- a/example/device/kinect/CMakeLists.txt +++ b/example/device/kinect/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-device-kinect) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_sensor visp_gui) diff --git a/example/device/laserscanner/CMakeLists.txt b/example/device/laserscanner/CMakeLists.txt index 27db5c1d4d..47eb6205fd 100644 --- a/example/device/laserscanner/CMakeLists.txt +++ b/example/device/laserscanner/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-device-laserscanner) diff --git a/example/device/light/CMakeLists.txt b/example/device/light/CMakeLists.txt index adc44f3adb..71c88d6902 100644 --- a/example/device/light/CMakeLists.txt +++ b/example/device/light/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-device-laserscanner) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_robot visp_io) diff --git a/example/direct-visual-servoing/CMakeLists.txt b/example/direct-visual-servoing/CMakeLists.txt index 868061c77c..806d868df3 100644 --- a/example/direct-visual-servoing/CMakeLists.txt +++ b/example/direct-visual-servoing/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-direct-vvs) diff --git a/example/homography/CMakeLists.txt b/example/homography/CMakeLists.txt index 91e6e05c8e..8fa544b466 100644 --- a/example/homography/CMakeLists.txt +++ b/example/homography/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-homography) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_vision visp_io) diff --git a/example/image/CMakeLists.txt b/example/image/CMakeLists.txt index 578b391ac3..7b1fa6a52c 100644 --- a/example/image/CMakeLists.txt +++ b/example/image/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-image) diff --git a/example/kalman/CMakeLists.txt b/example/kalman/CMakeLists.txt index 103891f971..72a8f087b6 100644 --- a/example/kalman/CMakeLists.txt +++ b/example/kalman/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-kalman) diff --git a/example/manual/CMakeLists.txt b/example/manual/CMakeLists.txt index f6aa07dc0b..20e18a669e 100644 --- a/example/manual/CMakeLists.txt +++ b/example/manual/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-manual) diff --git a/example/manual/geometric-features/CMakeLists.txt b/example/manual/geometric-features/CMakeLists.txt index 6b8a0dec87..f21caf5667 100644 --- a/example/manual/geometric-features/CMakeLists.txt +++ b/example/manual/geometric-features/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(GeometricFeatures) @@ -8,4 +8,3 @@ if(VISP_FOUND) endif() add_executable(manGeometricFeatures manGeometricFeatures.cpp) - diff --git a/example/manual/hello-world/CMake/CMakeLists.txt b/example/manual/hello-world/CMake/CMakeLists.txt index fb494a6148..336c570db5 100644 --- a/example/manual/hello-world/CMake/CMakeLists.txt +++ b/example/manual/hello-world/CMake/CMakeLists.txt @@ -1,6 +1,6 @@ project(HelloWorld) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED) if(VISP_FOUND) diff --git a/example/manual/image-manipulation/CMakeLists.txt b/example/manual/image-manipulation/CMakeLists.txt index f30596085f..3884e184d0 100644 --- a/example/manual/image-manipulation/CMakeLists.txt +++ b/example/manual/image-manipulation/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(ImageManipulation) @@ -12,4 +12,3 @@ add_executable(manGrab1394 manGrab1394.cpp) add_executable(manGrabDirectShow manGrabDirectShow.cpp) add_executable(manGrabDisk manGrabDisk.cpp) add_executable(manGrabV4l2 manGrabV4l2.cpp) - diff --git a/example/manual/moments/CMakeLists.txt b/example/manual/moments/CMakeLists.txt index d618b807de..71fdda43db 100644 --- a/example/manual/moments/CMakeLists.txt +++ b/example/manual/moments/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(man-moment) @@ -8,5 +8,3 @@ if(VISP_FOUND) endif() add_executable(manServoMomentsSimple manServoMomentsSimple.cpp) - - diff --git a/example/manual/ogre/CMakeLists.txt b/example/manual/ogre/CMakeLists.txt index d1f97d9811..915b84ae2f 100644 --- a/example/manual/ogre/CMakeLists.txt +++ b/example/manual/ogre/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(OgreTutorial) diff --git a/example/manual/simulation/CMakeLists.txt b/example/manual/simulation/CMakeLists.txt index 24d09a2551..5dd3f5f615 100644 --- a/example/manual/simulation/CMakeLists.txt +++ b/example/manual/simulation/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(ImageManipulation) @@ -10,4 +10,3 @@ endif() add_executable(manServo4PointsDisplay manServo4PointsDisplay.cpp) add_executable(manSimu4Dots manSimu4Dots.cpp) add_executable(manSimu4Points manSimu4Points.cpp) - diff --git a/example/math/CMakeLists.txt b/example/math/CMakeLists.txt index fc150f27a7..4ba0a86ced 100644 --- a/example/math/CMakeLists.txt +++ b/example/math/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-math) diff --git a/example/moments/image/CMakeLists.txt b/example/moments/image/CMakeLists.txt index 29f33b4078..795200f312 100644 --- a/example/moments/image/CMakeLists.txt +++ b/example/moments/image/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-moments-image) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_vs visp_robot visp_gui) diff --git a/example/moments/points/CMakeLists.txt b/example/moments/points/CMakeLists.txt index 3130e99edc..4cd1d692ec 100644 --- a/example/moments/points/CMakeLists.txt +++ b/example/moments/points/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-moments-points) diff --git a/example/moments/polygon/CMakeLists.txt b/example/moments/polygon/CMakeLists.txt index 5e36802fa6..d8940e4853 100644 --- a/example/moments/polygon/CMakeLists.txt +++ b/example/moments/polygon/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-moments-polygon) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_vs visp_robot visp_gui) diff --git a/example/ogre-simulator/CMakeLists.txt b/example/ogre-simulator/CMakeLists.txt index d4e37fa461..7209cc76d4 100644 --- a/example/ogre-simulator/CMakeLists.txt +++ b/example/ogre-simulator/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-ogre-simulator) diff --git a/example/parse-argv/CMakeLists.txt b/example/parse-argv/CMakeLists.txt index 2c28315bf0..51f51d60b8 100644 --- a/example/parse-argv/CMakeLists.txt +++ b/example/parse-argv/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-parse-argv) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_io) diff --git a/example/particle-filter/CMakeLists.txt b/example/particle-filter/CMakeLists.txt index a888328ea1..9fcb2d9d1d 100644 --- a/example/particle-filter/CMakeLists.txt +++ b/example/particle-filter/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-kalman) diff --git a/example/pose-estimation/CMakeLists.txt b/example/pose-estimation/CMakeLists.txt index faf47cef22..04789e535a 100644 --- a/example/pose-estimation/CMakeLists.txt +++ b/example/pose-estimation/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-pose-estimation) diff --git a/example/reflex-takktile/CMakeLists.txt b/example/reflex-takktile/CMakeLists.txt index 505ea9a81e..62128e0c2d 100644 --- a/example/reflex-takktile/CMakeLists.txt +++ b/example/reflex-takktile/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-reflex-takktile) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore) set(WINRT TRUE) diff --git a/example/robot-simulator/afma6/CMakeLists.txt b/example/robot-simulator/afma6/CMakeLists.txt index a9394ecf8d..14bc0ad498 100644 --- a/example/robot-simulator/afma6/CMakeLists.txt +++ b/example/robot-simulator/afma6/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-robot-simulator-afma6) diff --git a/example/robot-simulator/camera/CMakeLists.txt b/example/robot-simulator/camera/CMakeLists.txt index f5182b886f..2986412d99 100644 --- a/example/robot-simulator/camera/CMakeLists.txt +++ b/example/robot-simulator/camera/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-robot-simulator-camera) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore) set(WINRT TRUE) diff --git a/example/robot-simulator/viper850/CMakeLists.txt b/example/robot-simulator/viper850/CMakeLists.txt index 12b88ad0ca..f29a27327e 100644 --- a/example/robot-simulator/viper850/CMakeLists.txt +++ b/example/robot-simulator/viper850/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-robot-simulator-viper850) diff --git a/example/servo-afma4/CMakeLists.txt b/example/servo-afma4/CMakeLists.txt index b001f434d0..0fb38fb468 100644 --- a/example/servo-afma4/CMakeLists.txt +++ b/example/servo-afma4/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-servo-afma4) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_blob visp_vs visp_robot visp_sensor visp_gui) diff --git a/example/servo-afma6/CMakeLists.txt b/example/servo-afma6/CMakeLists.txt index ebab48577e..37039c6cf8 100644 --- a/example/servo-afma6/CMakeLists.txt +++ b/example/servo-afma6/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-servo-afma6) diff --git a/example/servo-bebop2/CMakeLists.txt b/example/servo-bebop2/CMakeLists.txt index 82006c1f53..8b14461b13 100644 --- a/example/servo-bebop2/CMakeLists.txt +++ b/example/servo-bebop2/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-servo-bebop2) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_vs visp_robot visp_gui visp_detection) diff --git a/example/servo-biclops/CMakeLists.txt b/example/servo-biclops/CMakeLists.txt index e3a22ceb6a..d4920983d2 100644 --- a/example/servo-biclops/CMakeLists.txt +++ b/example/servo-biclops/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-servo-biclops) diff --git a/example/servo-flir-ptu/CMakeLists.txt b/example/servo-flir-ptu/CMakeLists.txt index 04b0a0db50..794091a393 100644 --- a/example/servo-flir-ptu/CMakeLists.txt +++ b/example/servo-flir-ptu/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-servo-flir-ptu) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_robot visp_sensor visp_vision visp_gui visp_vs visp_visual_features visp_detection) diff --git a/example/servo-franka/CMakeLists.txt b/example/servo-franka/CMakeLists.txt index 8c2d5ceebb..45b822ed4d 100644 --- a/example/servo-franka/CMakeLists.txt +++ b/example/servo-franka/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-servo-franka) diff --git a/example/servo-franka/frankaGripper.cpp b/example/servo-franka/frankaGripper.cpp index 76a5c73938..5b98186c5f 100644 --- a/example/servo-franka/frankaGripper.cpp +++ b/example/servo-franka/frankaGripper.cpp @@ -1,7 +1,6 @@ -/**************************************************************************** - * +/* * ViSP, open source Visual Servoing Platform software. - * Copyright (C) 2005 - 2023 by Inria. All rights reserved. + * Copyright (C) 2005 - 2024 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 @@ -30,8 +29,7 @@ * * Description: * Franka robot tool. - * -*****************************************************************************/ + */ /*! \example frankaGripper.cpp @@ -64,11 +62,14 @@ int main(int argc, char **argv) std::string opt_robot_ip = "192.168.1.1"; double opt_grasping_width = 0.; + double opt_grasping_speed = 0.1; + double opt_grasping_force = 60; GripperState_t opt_gripper_state = Gripper_None; for (int i = 1; i < argc; i++) { if (std::string(argv[i]) == "--ip" && i + 1 < argc) { - opt_robot_ip = std::string(argv[i + 1]); + ++ i; + opt_robot_ip = std::string(argv[i]); } else if (std::string(argv[i]) == "--home") { opt_gripper_state = Gripper_Home; @@ -80,22 +81,79 @@ int main(int argc, char **argv) opt_gripper_state = Gripper_Close; } else if (std::string(argv[i]) == "--grasp" && i + 1 < argc) { + ++ i; opt_gripper_state = Gripper_Grasp; - opt_grasping_width = std::atof(argv[i + 1]); + opt_grasping_width = std::atof(argv[i]); + } + else if (std::string(argv[i]) == "--grasp-speed" && i + 1 < argc) { + ++ i; + opt_grasping_speed = std::atof(argv[i]); + } + else if (std::string(argv[i]) == "--grasp-force" && i + 1 < argc) { + ++ i; + opt_grasping_force = std::atof(argv[i]); } else if (std::string(argv[i]) == "--test" && i + 1 < argc) { + ++ i; opt_gripper_state = Gripper_Test; - opt_grasping_width = std::atof(argv[i + 1]); + opt_grasping_width = std::atof(argv[i]); } else if (std::string(argv[i]) == "--help" || std::string(argv[i]) == "-h") { - std::cout << "Control Panda gripper." << std::endl; - std::cout << argv[0] << " [--ip ] [--home] [--open] [--close] [--grasp ] [--release] [--test ] [--help] [-h]\n" + std::cout << "SYNOPSYS" << std::endl + << " " << argv[0] + << " [--ip ]" + << " [--home]" + << " [--open]" + << " [--close]" + << " [--grasp ]" + << " [--grasp-speed ]" + << " [--grasp-force ]" + << " [--release]" + << " [--test ]" + << " [--help] [-h]\n" << std::endl; + std::cout << "DESCRIPTION" << std::endl + << " Control Panda gripper." << std::endl + << std::endl + << " --ip " << std::endl + << " Franka controller ip address" << std::endl + << " Default: " << opt_robot_ip << std::endl + << std::endl + << " --home" << std::endl + << " Performs homing of the gripper." << std::endl + << std::endl + << " --open" << std::endl + << " Performs opening of the gripper." << std::endl + << std::endl + << " --close" << std::endl + << " Performs closing of the gripper." << std::endl + << std::endl + << " --grasp " << std::endl + << " Performs grasping of an object." << std::endl + << " Object width is to specify in [m]." << std::endl + << " Default width: " << opt_grasping_width << " [m]" << std::endl + << std::endl + << " --grasp-speed " << std::endl + << " Closing speed in [m/s] applied during grasping." << std::endl + << " Default: " << opt_grasping_speed << " [m/s]" << std::endl + << std::endl + << " --grasp-force " << std::endl + << " Force in [N] applied during grasping." << std::endl + << " Default: " << opt_grasping_force << " [N]" << std::endl + << std::endl + << " --release" << std::endl + << " Release an object that is grasped." << std::endl + << std::endl + << " --test " << std::endl + << " Performs a gripper test on an object width specified in [m]." << std::endl + << " Default width: " << opt_grasping_width << " [m]" << std::endl + << std::endl + << " --help, -h" << std::endl + << " Print this helper message." << std::endl << std::endl; - std::cout << "Example to grasp a 4cm width object by first opening the gripper, then grasping the object :\n" - << argv[0] << " --ip 192.168.100.1 --open\n" - << argv[0] << " --ip 192.168.100.1 --grasp 0.04\n" + std::cout << "EXAMPLE" << std::endl + << " To grasp a 4cm width object by first opening the gripper, then grasping the object:\n" + << " " << argv[0] << " --ip 192.168.100.1 --open\n" + << " " << argv[0] << " --ip 192.168.100.1 --grasp 0.04\n" << std::endl; return EXIT_SUCCESS; @@ -131,8 +189,8 @@ int main(int argc, char **argv) robot.gripperOpen(); } else if (opt_gripper_state == Gripper_Grasp) { - std::cout << "Gripper grasp " << opt_grasping_width << "m object width..." << std::endl; - robot.gripperGrasp(opt_grasping_width); + std::cout << "Gripper grasp " << opt_grasping_width << "m object width, with speed: " << opt_grasping_speed << " and force: " << opt_grasping_force << "N..." << std::endl; + robot.gripperGrasp(opt_grasping_width, opt_grasping_speed, opt_grasping_force); } else if (opt_gripper_state == Gripper_Release) { std::cout << "Gripper release object..." << std::endl; @@ -152,8 +210,8 @@ int main(int argc, char **argv) std::cout << "- Gripper opening..." << std::endl; robot.gripperOpen(); vpTime::sleepMs(3000); - std::cout << "- Gripper grasp " << opt_grasping_width << "m object width..." << std::endl; - robot.gripperGrasp(opt_grasping_width); + std::cout << "- Gripper grasp " << opt_grasping_width << "m object width, with speed: " << opt_grasping_speed << " and force: " << opt_grasping_force << "N..." << std::endl; + robot.gripperGrasp(opt_grasping_width, opt_grasping_speed, opt_grasping_force); vpTime::sleepMs(3000); std::cout << "- Gripper release object..." << std::endl; robot.gripperRelease(); diff --git a/example/servo-kinova/CMakeLists.txt b/example/servo-kinova/CMakeLists.txt index e0eaea3467..d699153a23 100644 --- a/example/servo-kinova/CMakeLists.txt +++ b/example/servo-kinova/CMakeLists.txt @@ -38,7 +38,7 @@ project(example-servo-kinova) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_blob visp_vs visp_robot visp_sensor visp_gui) diff --git a/example/servo-pioneer/CMakeLists.txt b/example/servo-pioneer/CMakeLists.txt index 996a6f2431..cde4d4fdf5 100644 --- a/example/servo-pioneer/CMakeLists.txt +++ b/example/servo-pioneer/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-servo-pioneer) diff --git a/example/servo-pixhawk/CMakeLists.txt b/example/servo-pixhawk/CMakeLists.txt index b691c1e875..2d0017aeba 100644 --- a/example/servo-pixhawk/CMakeLists.txt +++ b/example/servo-pixhawk/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-servo-pixhawk) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_vs visp_robot visp_gui visp_detection visp_sensor) diff --git a/example/servo-pololu-ptu/CMakeLists.txt b/example/servo-pololu-ptu/CMakeLists.txt index 913e3097b8..c549f3a74e 100644 --- a/example/servo-pololu-ptu/CMakeLists.txt +++ b/example/servo-pololu-ptu/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-servo-biclops) diff --git a/example/servo-ptu46/CMakeLists.txt b/example/servo-ptu46/CMakeLists.txt index d780d0b335..0921290e50 100644 --- a/example/servo-ptu46/CMakeLists.txt +++ b/example/servo-ptu46/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-servo-ptu46) diff --git a/example/servo-universal-robots/CMakeLists.txt b/example/servo-universal-robots/CMakeLists.txt index d9a2acc0a8..74292dc6df 100644 --- a/example/servo-universal-robots/CMakeLists.txt +++ b/example/servo-universal-robots/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-servo-universal-robots) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_robot visp_io) diff --git a/example/servo-viper650/CMakeLists.txt b/example/servo-viper650/CMakeLists.txt index 8ecacc0bd4..679676223e 100644 --- a/example/servo-viper650/CMakeLists.txt +++ b/example/servo-viper650/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-servo-viper650) diff --git a/example/servo-viper850/CMakeLists.txt b/example/servo-viper850/CMakeLists.txt index 778f17f28f..d3e2229aae 100644 --- a/example/servo-viper850/CMakeLists.txt +++ b/example/servo-viper850/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-servo-viper850) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore) set(WINRT TRUE) diff --git a/example/tools/CMakeLists.txt b/example/tools/CMakeLists.txt index a6b5580753..318392ec6b 100644 --- a/example/tools/CMakeLists.txt +++ b/example/tools/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-servo-tools) diff --git a/example/tracking/CMakeLists.txt b/example/tracking/CMakeLists.txt index 21f4bfccc1..cad1f2ecf7 100644 --- a/example/tracking/CMakeLists.txt +++ b/example/tracking/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-tracking) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_blob visp_io visp_gui visp_mbt visp_me visp_tt visp_tt_mi) diff --git a/example/video/CMakeLists.txt b/example/video/CMakeLists.txt index 14e3c049e3..78d5b91412 100644 --- a/example/video/CMakeLists.txt +++ b/example/video/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(example-video) diff --git a/example/wireframe-simulator/CMakeLists.txt b/example/wireframe-simulator/CMakeLists.txt index cf4ea55194..02cac5fae6 100644 --- a/example/wireframe-simulator/CMakeLists.txt +++ b/example/wireframe-simulator/CMakeLists.txt @@ -35,7 +35,7 @@ project(example-wireframe-simulator) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_robot visp_io visp_gui) diff --git a/modules/core/include/visp3/core/vpHomogeneousMatrix.h b/modules/core/include/visp3/core/vpHomogeneousMatrix.h index 3883dff892..41bde6a97e 100644 --- a/modules/core/include/visp3/core/vpHomogeneousMatrix.h +++ b/modules/core/include/visp3/core/vpHomogeneousMatrix.h @@ -326,6 +326,13 @@ class VISP_EXPORT vpHomogeneousMatrix : public vpArray2D * std::ofstream f("homogeneous.dat"); * M.save(f); * \endcode + * The content of "homogeneous.dat" is the following: + * \verbatim + * 0.7071067812 0.7071067812 0 1 + * 0.7071067812 -0.7071067812 -1.224646799e-16 2 + * -8.659560562e-17 8.659560562e-17 -1 3 + * 0 0 0 1 + * \endverbatim * * \sa save(const std::string &), load(std::ifstream &) */ @@ -348,6 +355,13 @@ class VISP_EXPORT vpHomogeneousMatrix : public vpArray2D * // Save the content of the matrix in "homogeneous.dat" * M.save("homogeneous.dat"); * \endcode + * The content of "homogeneous.dat" is the following: + * \verbatim + * 0.7071067812 0.7071067812 0 1 + * 0.7071067812 -0.7071067812 -1.224646799e-16 2 + * -8.659560562e-17 8.659560562e-17 -1 3 + * 0 0 0 1 + * \endverbatim * * \sa save(std::ofstream &), load(const std::string &) */ diff --git a/modules/sensor/include/visp3/sensor/vpOccipitalStructure.h b/modules/sensor/include/visp3/sensor/vpOccipitalStructure.h index 0f8b00aa00..9cdc487f38 100644 --- a/modules/sensor/include/visp3/sensor/vpOccipitalStructure.h +++ b/modules/sensor/include/visp3/sensor/vpOccipitalStructure.h @@ -84,7 +84,7 @@ BEGIN_VISP_NAMESPACE uses vpOccipitalStructure class. \code - cmake_minimum_required(VERSION 3.5) + cmake_minimum_required(VERSION 3.10) project(sample) diff --git a/platforms/android/android.toolchain.cmake b/platforms/android/android.toolchain.cmake index 0096a29c99..dbf6ed6f63 100644 --- a/platforms/android/android.toolchain.cmake +++ b/platforms/android/android.toolchain.cmake @@ -189,7 +189,7 @@ # # ------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) if( DEFINED CMAKE_CROSSCOMPILING ) # subsequent toolchain loading is not really needed diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt index 38d101ae34..33a706700d 100644 --- a/tutorial/CMakeLists.txt +++ b/tutorial/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(ViSP-tutorial) diff --git a/tutorial/ar/CMakeLists.txt b/tutorial/ar/CMakeLists.txt index bb3d849a2c..5caff00d84 100644 --- a/tutorial/ar/CMakeLists.txt +++ b/tutorial/ar/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-panda3d) diff --git a/tutorial/bridge/opencv/CMakeLists.txt b/tutorial/bridge/opencv/CMakeLists.txt index 012a5172da..1c2130b14c 100644 --- a/tutorial/bridge/opencv/CMakeLists.txt +++ b/tutorial/bridge/opencv/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-bridge-opencv) diff --git a/tutorial/computer-vision/CMakeLists.txt b/tutorial/computer-vision/CMakeLists.txt index d3b10a3f30..f4d90dad4e 100644 --- a/tutorial/computer-vision/CMakeLists.txt +++ b/tutorial/computer-vision/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-computer-vision) diff --git a/tutorial/detection/barcode/CMakeLists.txt b/tutorial/detection/barcode/CMakeLists.txt index 6f1d086f79..91bcfc4ad1 100644 --- a/tutorial/detection/barcode/CMakeLists.txt +++ b/tutorial/detection/barcode/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-barcode) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_detection visp_io visp_gui visp_sensor) diff --git a/tutorial/detection/dnn/CMakeLists.txt b/tutorial/detection/dnn/CMakeLists.txt index d726f78737..325700193a 100644 --- a/tutorial/detection/dnn/CMakeLists.txt +++ b/tutorial/detection/dnn/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-dnn-object-detection-live) diff --git a/tutorial/detection/face/CMakeLists.txt b/tutorial/detection/face/CMakeLists.txt index 138936ff15..b97a43add8 100644 --- a/tutorial/detection/face/CMakeLists.txt +++ b/tutorial/detection/face/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-detection-face) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_detection visp_io visp_gui visp_sensor) diff --git a/tutorial/detection/matching/CMakeLists.txt b/tutorial/detection/matching/CMakeLists.txt index ce6c88b8a0..5076d80f79 100644 --- a/tutorial/detection/matching/CMakeLists.txt +++ b/tutorial/detection/matching/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-matching-keypoint) diff --git a/tutorial/detection/object/CMakeLists.txt b/tutorial/detection/object/CMakeLists.txt index 0fe8da446d..139c97fac9 100644 --- a/tutorial/detection/object/CMakeLists.txt +++ b/tutorial/detection/object/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-detection-object) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_vision visp_mbt visp_io visp_gui) diff --git a/tutorial/detection/tag/CMakeLists.txt b/tutorial/detection/tag/CMakeLists.txt index 9ff0c7ea8b..90d26afdf9 100644 --- a/tutorial/detection/tag/CMakeLists.txt +++ b/tutorial/detection/tag/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-apriltag) diff --git a/tutorial/grabber/CMakeLists.txt b/tutorial/grabber/CMakeLists.txt index f6d2186f37..ff9fe368d4 100644 --- a/tutorial/grabber/CMakeLists.txt +++ b/tutorial/grabber/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-grabber) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_sensor visp_io visp_gui) diff --git a/tutorial/gui/pcl-visualizer/CMakeLists.txt b/tutorial/gui/pcl-visualizer/CMakeLists.txt index de775cc076..de45448cef 100644 --- a/tutorial/gui/pcl-visualizer/CMakeLists.txt +++ b/tutorial/gui/pcl-visualizer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-gui-pcl-visualizer) diff --git a/tutorial/image/CMakeLists.txt b/tutorial/image/CMakeLists.txt index 7fd6ad0b04..219cd5f77a 100644 --- a/tutorial/image/CMakeLists.txt +++ b/tutorial/image/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-image) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_io visp_gui) diff --git a/tutorial/imgproc/autothreshold/CMakeLists.txt b/tutorial/imgproc/autothreshold/CMakeLists.txt index bd1ee8af26..88532168e1 100644 --- a/tutorial/imgproc/autothreshold/CMakeLists.txt +++ b/tutorial/imgproc/autothreshold/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-autothreshold) diff --git a/tutorial/imgproc/brightness/CMakeLists.txt b/tutorial/imgproc/brightness/CMakeLists.txt index 283980c0f0..eba0bf44c1 100644 --- a/tutorial/imgproc/brightness/CMakeLists.txt +++ b/tutorial/imgproc/brightness/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-brightness-adjustment) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_io visp_gui visp_imgproc) diff --git a/tutorial/imgproc/connected-components/CMakeLists.txt b/tutorial/imgproc/connected-components/CMakeLists.txt index 98f25c7414..f09196251b 100644 --- a/tutorial/imgproc/connected-components/CMakeLists.txt +++ b/tutorial/imgproc/connected-components/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-connected-components) diff --git a/tutorial/imgproc/contour/CMakeLists.txt b/tutorial/imgproc/contour/CMakeLists.txt index 4a86ef28b8..296514e0b9 100644 --- a/tutorial/imgproc/contour/CMakeLists.txt +++ b/tutorial/imgproc/contour/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-contour) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_io visp_gui visp_imgproc) diff --git a/tutorial/imgproc/contrast-sharpening/CMakeLists.txt b/tutorial/imgproc/contrast-sharpening/CMakeLists.txt index 51d0204a8b..b6a25e73b7 100644 --- a/tutorial/imgproc/contrast-sharpening/CMakeLists.txt +++ b/tutorial/imgproc/contrast-sharpening/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-contrast-sharpening) diff --git a/tutorial/imgproc/count-coins/CMakeLists.txt b/tutorial/imgproc/count-coins/CMakeLists.txt index 9a3fa9235a..4d72bededf 100644 --- a/tutorial/imgproc/count-coins/CMakeLists.txt +++ b/tutorial/imgproc/count-coins/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-counting-coins) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_io visp_gui visp_imgproc) diff --git a/tutorial/imgproc/flood-fill/CMakeLists.txt b/tutorial/imgproc/flood-fill/CMakeLists.txt index 50a447d94c..163b9b1f75 100644 --- a/tutorial/imgproc/flood-fill/CMakeLists.txt +++ b/tutorial/imgproc/flood-fill/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-flood-fill) diff --git a/tutorial/imgproc/hough-transform/CMakeLists.txt b/tutorial/imgproc/hough-transform/CMakeLists.txt index e62b156ccc..e79db8ca29 100644 --- a/tutorial/imgproc/hough-transform/CMakeLists.txt +++ b/tutorial/imgproc/hough-transform/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-hough) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_gui visp_imgproc visp_io) diff --git a/tutorial/kalman/CMakeLists.txt b/tutorial/kalman/CMakeLists.txt index 67158faec3..e1cbbcd137 100644 --- a/tutorial/kalman/CMakeLists.txt +++ b/tutorial/kalman/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-kalman) diff --git a/tutorial/matlab/CMakeLists.txt b/tutorial/matlab/CMakeLists.txt index 746471797e..160991474d 100644 --- a/tutorial/matlab/CMakeLists.txt +++ b/tutorial/matlab/CMakeLists.txt @@ -1,6 +1,6 @@ project(visp-matlab) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core) include_directories(${VISP_INCLUDE_DIRS}) diff --git a/tutorial/mean-drift/CMakeLists.txt b/tutorial/mean-drift/CMakeLists.txt index 61aaff4046..8345319d67 100644 --- a/tutorial/mean-drift/CMakeLists.txt +++ b/tutorial/mean-drift/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-meandrift) diff --git a/tutorial/misc/npz/CMakeLists.txt b/tutorial/misc/npz/CMakeLists.txt index 0417a06e7b..ad710170ec 100644 --- a/tutorial/misc/npz/CMakeLists.txt +++ b/tutorial/misc/npz/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-npz) diff --git a/tutorial/munkres/CMakeLists.txt b/tutorial/munkres/CMakeLists.txt index 0b7c3c7290..cc58e7ef3f 100644 --- a/tutorial/munkres/CMakeLists.txt +++ b/tutorial/munkres/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-munkres) diff --git a/tutorial/particle-filter-curve-fitting/CMakeLists.txt b/tutorial/particle-filter-curve-fitting/CMakeLists.txt index f078da7cbb..ed219f7632 100644 --- a/tutorial/particle-filter-curve-fitting/CMakeLists.txt +++ b/tutorial/particle-filter-curve-fitting/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-pf) diff --git a/tutorial/particle-filter/CMakeLists.txt b/tutorial/particle-filter/CMakeLists.txt index 51d0108929..f02232aa25 100644 --- a/tutorial/particle-filter/CMakeLists.txt +++ b/tutorial/particle-filter/CMakeLists.txt @@ -33,7 +33,7 @@ # ############################################################################# -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-pf) diff --git a/tutorial/robot/flir-ptu/CMakeLists.txt b/tutorial/robot/flir-ptu/CMakeLists.txt index 7e70a4c986..926b1aecf5 100644 --- a/tutorial/robot/flir-ptu/CMakeLists.txt +++ b/tutorial/robot/flir-ptu/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-robot-flir-ptu) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore) set(WINRT TRUE) diff --git a/tutorial/robot/mbot/raspberry/visp/CMakeLists.txt b/tutorial/robot/mbot/raspberry/visp/CMakeLists.txt index eca0f697a1..c99ce6d3b7 100644 --- a/tutorial/robot/mbot/raspberry/visp/CMakeLists.txt +++ b/tutorial/robot/mbot/raspberry/visp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(visp-mbot) diff --git a/tutorial/robot/pioneer/CMakeLists.txt b/tutorial/robot/pioneer/CMakeLists.txt index 8d16e77b28..83710b1b22 100644 --- a/tutorial/robot/pioneer/CMakeLists.txt +++ b/tutorial/robot/pioneer/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-robot) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore) set(WINRT TRUE) diff --git a/tutorial/segmentation/color/CMakeLists.txt b/tutorial/segmentation/color/CMakeLists.txt index 622ce5c254..17c2b4a11c 100644 --- a/tutorial/segmentation/color/CMakeLists.txt +++ b/tutorial/segmentation/color/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(color_segmentation) diff --git a/tutorial/simulator/image/CMakeLists.txt b/tutorial/simulator/image/CMakeLists.txt index 9bd2869db2..ebf27801e2 100644 --- a/tutorial/simulator/image/CMakeLists.txt +++ b/tutorial/simulator/image/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-simulation-image) diff --git a/tutorial/trace/CMakeLists.txt b/tutorial/trace/CMakeLists.txt index c00d576636..5f1d5e6452 100644 --- a/tutorial/trace/CMakeLists.txt +++ b/tutorial/trace/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-trace) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core) diff --git a/tutorial/tracking/blob/CMakeLists.txt b/tutorial/tracking/blob/CMakeLists.txt index 78e6111cd0..75e77c3cea 100644 --- a/tutorial/tracking/blob/CMakeLists.txt +++ b/tutorial/tracking/blob/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-tracking-blob) diff --git a/tutorial/tracking/dnn/CMakeLists.txt b/tutorial/tracking/dnn/CMakeLists.txt index f7127a9373..8b4659893e 100644 --- a/tutorial/tracking/dnn/CMakeLists.txt +++ b/tutorial/tracking/dnn/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-tracking-dnn) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_detection visp_dnn_tracker visp_io visp_gui visp_sensor) diff --git a/tutorial/tracking/keypoint/CMakeLists.txt b/tutorial/tracking/keypoint/CMakeLists.txt index 3c6d2fa051..21d12078e2 100644 --- a/tutorial/tracking/keypoint/CMakeLists.txt +++ b/tutorial/tracking/keypoint/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-tracking-keypoint) diff --git a/tutorial/tracking/model-based/generic-apriltag/CMakeLists.txt b/tutorial/tracking/model-based/generic-apriltag/CMakeLists.txt index 9228cdb133..7755fc7014 100644 --- a/tutorial/tracking/model-based/generic-apriltag/CMakeLists.txt +++ b/tutorial/tracking/model-based/generic-apriltag/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-tracking-mb-aprilTag-init) diff --git a/tutorial/tracking/model-based/generic-rgbd-blender/CMakeLists.txt b/tutorial/tracking/model-based/generic-rgbd-blender/CMakeLists.txt index fa06fcb773..7bd35f6d5e 100644 --- a/tutorial/tracking/model-based/generic-rgbd-blender/CMakeLists.txt +++ b/tutorial/tracking/model-based/generic-rgbd-blender/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-tracking-mb-generic-rgbd-blender) diff --git a/tutorial/tracking/model-based/generic-rgbd/CMakeLists.txt b/tutorial/tracking/model-based/generic-rgbd/CMakeLists.txt index 52c62d772a..48a2b89f24 100644 --- a/tutorial/tracking/model-based/generic-rgbd/CMakeLists.txt +++ b/tutorial/tracking/model-based/generic-rgbd/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-tracking-mb-generic-rgbd) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_mbt visp_io visp_gui visp_sensor) diff --git a/tutorial/tracking/model-based/generic-stereo/CMakeLists.txt b/tutorial/tracking/model-based/generic-stereo/CMakeLists.txt index d04f4246d4..bb6ca59cd3 100644 --- a/tutorial/tracking/model-based/generic-stereo/CMakeLists.txt +++ b/tutorial/tracking/model-based/generic-stereo/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-tracking-mb-generic-stereo) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_mbt visp_io visp_gui) diff --git a/tutorial/tracking/model-based/generic/CMakeLists.txt b/tutorial/tracking/model-based/generic/CMakeLists.txt index c25d5210cc..b6d059981d 100644 --- a/tutorial/tracking/model-based/generic/CMakeLists.txt +++ b/tutorial/tracking/model-based/generic/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-tracking-mb) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_mbt visp_io visp_gui visp_sensor) diff --git a/tutorial/tracking/model-based/generic/tutorial-mb-generic-tracker.cpp b/tutorial/tracking/model-based/generic/tutorial-mb-generic-tracker.cpp index c17236c03d..43cba451b0 100644 --- a/tutorial/tracking/model-based/generic/tutorial-mb-generic-tracker.cpp +++ b/tutorial/tracking/model-based/generic/tutorial-mb-generic-tracker.cpp @@ -136,8 +136,6 @@ int main(int argc, char **argv) tracker.initClick(I, objectname + ".init", true); //! [Init] - - while (!g.end()) { g.acquire(I); vpDisplay::display(I); @@ -155,8 +153,9 @@ int main(int argc, char **argv) vpDisplay::displayText(I, 10, 10, "A click to exit...", vpColor::red); vpDisplay::flush(I); - if (vpDisplay::getClick(I, false)) + if (vpDisplay::getClick(I, false)) { break; + } } vpDisplay::getClick(I); //! [Cleanup] diff --git a/tutorial/tracking/model-based/old/edges/CMakeLists.txt b/tutorial/tracking/model-based/old/edges/CMakeLists.txt index 43ce2df611..b069c72f9c 100644 --- a/tutorial/tracking/model-based/old/edges/CMakeLists.txt +++ b/tutorial/tracking/model-based/old/edges/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-tracking-mb-edges) diff --git a/tutorial/tracking/model-based/old/generic/CMakeLists.txt b/tutorial/tracking/model-based/old/generic/CMakeLists.txt index f2593f172e..617e101903 100644 --- a/tutorial/tracking/model-based/old/generic/CMakeLists.txt +++ b/tutorial/tracking/model-based/old/generic/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-tracking-mb) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_mbt visp_io visp_gui) diff --git a/tutorial/tracking/model-based/old/hybrid/CMakeLists.txt b/tutorial/tracking/model-based/old/hybrid/CMakeLists.txt index 1de9cf3031..4d67e6b3b8 100644 --- a/tutorial/tracking/model-based/old/hybrid/CMakeLists.txt +++ b/tutorial/tracking/model-based/old/hybrid/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-tracking-mb-hybrid) diff --git a/tutorial/tracking/model-based/old/keypoint/CMakeLists.txt b/tutorial/tracking/model-based/old/keypoint/CMakeLists.txt index 1e2cd8564e..7ce1c5bd19 100644 --- a/tutorial/tracking/model-based/old/keypoint/CMakeLists.txt +++ b/tutorial/tracking/model-based/old/keypoint/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-tracking-mb-keypoint) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_mbt visp_klt visp_gui) diff --git a/tutorial/tracking/moving-edges/CMakeLists.txt b/tutorial/tracking/moving-edges/CMakeLists.txt index 4532743d12..5adc69f3a0 100644 --- a/tutorial/tracking/moving-edges/CMakeLists.txt +++ b/tutorial/tracking/moving-edges/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-tracking-me) diff --git a/tutorial/tracking/template-tracker/CMakeLists.txt b/tutorial/tracking/template-tracker/CMakeLists.txt index 33032e7502..505d6cc1c3 100644 --- a/tutorial/tracking/template-tracker/CMakeLists.txt +++ b/tutorial/tracking/template-tracker/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-tracking-template) -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) find_package(VISP REQUIRED visp_core visp_tt visp_io visp_gui) diff --git a/tutorial/visual-servo/ibvs/CMakeLists.txt b/tutorial/visual-servo/ibvs/CMakeLists.txt index 695b38b33c..b621bd5519 100644 --- a/tutorial/visual-servo/ibvs/CMakeLists.txt +++ b/tutorial/visual-servo/ibvs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(tutorial-visual-servo-ibvs)