Merge pull request #1395 from fspindle/fix_cmake

Add missing required visp modules when tutorials/examples are build as stand alone projects
lagadic · May 1, 2024 · 2fc7f61 · 2fc7f61
2 parents e1b6b55 + c5a86d3
commit 2fc7f61
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 26 deletions.
diff --git a/example/device/laserscanner/CMakeLists.txt b/example/device/laserscanner/CMakeLists.txt
@@ -37,7 +37,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(example-device-laserscanner)
 
-find_package(VISP REQUIRED visp_core visp_sensor visp_io)
+find_package(VISP REQUIRED visp_core visp_gui visp_sensor visp_io)
 
 set(example_cpp
   SickLDMRS-Acq.cpp

diff --git a/example/direct-visual-servoing/CMakeLists.txt b/example/direct-visual-servoing/CMakeLists.txt
@@ -37,7 +37,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(example-direct-vvs)
 
-find_package(VISP REQUIRED visp_core visp_robot visp_visual_features visp_io visp_gui)
+find_package(VISP REQUIRED visp_core visp_robot visp_visual_features visp_vs visp_io visp_gui)
 
 set(example_cpp
   photometricVisualServoing.cpp

diff --git a/example/manual/CMakeLists.txt b/example/manual/CMakeLists.txt
@@ -43,7 +43,7 @@ set(example_cpp
   geometric-features/manGeometricFeatures.cpp
   hello-world/CMake/HelloWorld.cpp
   image-manipulation/manDisplay.cpp
-  image-manipulation/manGrab1394-2.cpp
+  image-manipulation/manGrab1394.cpp
   image-manipulation/manGrabDirectShow.cpp
   image-manipulation/manGrabDisk.cpp
   image-manipulation/manGrabV4l2.cpp

diff --git a/example/manual/geometric-features/CMakeLists.txt b/example/manual/geometric-features/CMakeLists.txt
@@ -1,8 +1,11 @@
-PROJECT(GeometricFeatures)
+cmake_minimum_required(VERSION 3.5)
 
-FIND_PACKAGE(VISP REQUIRED)
-IF(VISP_FOUND)
-  INCLUDE(${VISP_USE_FILE})
-ENDIF(VISP_FOUND)
+project(GeometricFeatures)
+
+find_package(VISP REQUIRED)
+if(VISP_FOUND)
+  include(${VISP_USE_FILE})
+endif()
+
+add_executable(manGeometricFeatures manGeometricFeatures.cpp)
 
-ADD_EXECUTABLE(manGeometricFeatures manGeometricFeatures.cpp)
diff --git a/example/manual/image-manipulation/CMakeLists.txt b/example/manual/image-manipulation/CMakeLists.txt
@@ -1,14 +1,15 @@
-PROJECT(ImageManipulation)
-
-FIND_PACKAGE(VISP REQUIRED)
-IF(VISP_FOUND)
-  INCLUDE(${VISP_USE_FILE})
-ENDIF(VISP_FOUND)
-
-ADD_EXECUTABLE(manDisplay        manDisplay.cpp)
-ADD_EXECUTABLE(manGrab1394-1     manGrab1394-1.cpp)
-ADD_EXECUTABLE(manGrab1394-2     manGrab1394-2.cpp)
-ADD_EXECUTABLE(manGrabDirectShow manGrabDirectShow.cpp)
-ADD_EXECUTABLE(manGrabDisk       manGrabDisk.cpp)
-ADD_EXECUTABLE(manGrabV4l2       manGrabV4l2.cpp)
+cmake_minimum_required(VERSION 3.5)
+
+project(ImageManipulation)
+
+find_package(VISP REQUIRED)
+if(VISP_FOUND)
+  include(${VISP_USE_FILE})
+endif()
+
+add_executable(manDisplay        manDisplay.cpp)
+add_executable(manGrab1394       manGrab1394.cpp)
+add_executable(manGrabDirectShow manGrabDirectShow.cpp)
+add_executable(manGrabDisk       manGrabDisk.cpp)
+add_executable(manGrabV4l2       manGrabV4l2.cpp)
 
diff --git a/...nual/image-manipulation/manGrab1394-2.cpp → ...manual/image-manipulation/manGrab1394.cpp b/...nual/image-manipulation/manGrab1394-2.cpp → ...manual/image-manipulation/manGrab1394.cpp
diff --git a/example/manual/moments/CMakeLists.txt b/example/manual/moments/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(man-moment)
+
+find_package(VISP REQUIRED)
+if(VISP_FOUND)
+  include(${VISP_USE_FILE})
+endif()
+
+add_executable(manServoMomentsSimple manServoMomentsSimple.cpp)
+
+
diff --git a/example/manual/ogre/CMakeLists.txt b/example/manual/ogre/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.5)
+
 project(OgreTutorial)
 
 find_package(VISP REQUIRED)
@@ -8,3 +10,8 @@ endif()
 add_executable(HelloWorldOgre HelloWorldOgre.cpp)
 add_executable(HelloWorldOgreAdvanced HelloWorldOgreAdvanced.cpp)
 
+if(VISP_HAVE_OGRE)
+  # Add specific build flag to turn off warnings coming from libogre and libois 3rd party
+  visp_set_source_file_compile_flag(HelloWorldOgre.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register)
+  visp_set_source_file_compile_flag(HelloWorldOgreAdvanced.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register)
+endif()
diff --git a/example/manual/simulation/CMakeLists.txt b/example/manual/simulation/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(ImageManipulation)
+
+find_package(VISP REQUIRED)
+if(VISP_FOUND)
+  include(${VISP_USE_FILE})
+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
@@ -37,7 +37,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(example-math)
 
-find_package(VISP REQUIRED visp_core visp_io)
+find_package(VISP REQUIRED visp_core visp_gui visp_io)
 
 set(example_cpp
   exponentialMap.cpp

diff --git a/example/servo-afma6/CMakeLists.txt b/example/servo-afma6/CMakeLists.txt
@@ -64,7 +64,7 @@ if(WINRT)
   endif()
 endif()
 
-find_package(VISP REQUIRED visp_core visp_blob visp_vs visp_robot visp_sensor visp_vision visp_gui)
+find_package(VISP REQUIRED visp_core visp_blob visp_detection visp_vs visp_robot visp_sensor visp_vision visp_gui)
 
 set(example_cpp
   servoAfma6Ellipse2DCamVelocity.cpp

diff --git a/example/tracking/CMakeLists.txt b/example/tracking/CMakeLists.txt
@@ -37,7 +37,7 @@ project(example-tracking)
 
 cmake_minimum_required(VERSION 3.5)
 
-find_package(VISP REQUIRED visp_core visp_io visp_gui)
+find_package(VISP REQUIRED visp_core visp_blob visp_io visp_gui visp_mbt visp_me visp_tt visp_tt_mi)
 
 set(example_cpp
   mbtEdgeKltTracking.cpp

diff --git a/tutorial/imgproc/hough-transform/CMakeLists.txt b/tutorial/imgproc/hough-transform/CMakeLists.txt
@@ -2,7 +2,7 @@ project(tutorial-hough)
 
 cmake_minimum_required(VERSION 3.5)
 
-find_package(VISP REQUIRED visp_core visp_gui visp_imgproc)
+find_package(VISP REQUIRED visp_core visp_gui visp_imgproc visp_io)
 
 # set the list of source files
 set(tutorial_cpp