diff --git a/example/device/laserscanner/CMakeLists.txt b/example/device/laserscanner/CMakeLists.txt index 6497659f38..27db5c1d4d 100644 --- 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 index 16ef2260ca..edff7fef93 100644 --- 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 index 4e77287193..f6aa07dc0b 100644 --- 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 index 9699a72d61..6b8a0dec87 100644 --- 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 index a212540db1..f30596085f 100644 --- 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/example/manual/image-manipulation/manGrab1394-2.cpp b/example/manual/image-manipulation/manGrab1394.cpp similarity index 100% rename from example/manual/image-manipulation/manGrab1394-2.cpp rename to example/manual/image-manipulation/manGrab1394.cpp diff --git a/example/manual/moments/CMakeLists.txt b/example/manual/moments/CMakeLists.txt new file mode 100644 index 0000000000..d618b807de --- /dev/null +++ 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 index 6a6772bdda..d1f97d9811 100644 --- 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 new file mode 100644 index 0000000000..24d09a2551 --- /dev/null +++ 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 index 114ad1ada8..fc150f27a7 100644 --- 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 index 0294e4d03a..20eee630ce 100644 --- 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 index f24b612f4b..21f4bfccc1 100644 --- 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 index 2fd83346bc..e62b156ccc 100644 --- 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