diff --git a/CMakeLists.txt b/CMakeLists.txt index 0696f8e6f78852310730ff5af776fbe0a8db88f1..0a20152c83ccaf5a3bd94cbe5a927499df14bd6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.10) ####################################################################################### PROJECT(Simox LANGUAGES CXX VERSION 2.3.74.0) MESSAGE (STATUS "** Simox version: ${Simox_VERSION}") +INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) ####################################################################################### #global config # Set up build type diff --git a/GraspPlanning/examples/GraspPlanner/CMakeLists.txt b/GraspPlanning/examples/GraspPlanner/CMakeLists.txt index c82c0a8fc325cce39da3d6cc1db450c22291e89d..7dca63aeb7f5ae478ee20f7c2c2d8eee665accdf 100644 --- a/GraspPlanning/examples/GraspPlanner/CMakeLists.txt +++ b/GraspPlanning/examples/GraspPlanner/CMakeLists.txt @@ -1,8 +1,5 @@ PROJECT ( GraspPlanner ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/GraspPlanning/examples/GraspQuality/CMakeLists.txt b/GraspPlanning/examples/GraspQuality/CMakeLists.txt index 3b62c7b5157105087eb36c534fbbf1b07190ebe5..9f2467c730335f322fbcbb400e5e44ed3e347790 100644 --- a/GraspPlanning/examples/GraspQuality/CMakeLists.txt +++ b/GraspPlanning/examples/GraspQuality/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( GraspQuality ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/MotionPlanning/examples/GraspRRT/CMakeLists.txt b/MotionPlanning/examples/GraspRRT/CMakeLists.txt index b3ef83e788d0120d2224eb8b065e50f737613021..c9b484f8319b2975390979cc4c9d0b7fa39eb717 100644 --- a/MotionPlanning/examples/GraspRRT/CMakeLists.txt +++ b/MotionPlanning/examples/GraspRRT/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( GraspRrtDemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/MotionPlanning/examples/IKRRT/CMakeLists.txt b/MotionPlanning/examples/IKRRT/CMakeLists.txt index 59bce16d12c350a84bf3d5fdd07e1abdd92b82e7..688fb6638e35e49f0f9bb17bbe36d61f246773db 100644 --- a/MotionPlanning/examples/IKRRT/CMakeLists.txt +++ b/MotionPlanning/examples/IKRRT/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( IKRRT ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/MotionPlanning/examples/MultiThreadedPlanning/CMakeLists.txt b/MotionPlanning/examples/MultiThreadedPlanning/CMakeLists.txt index eba5a9ef4b6aead5c9d4b463236d1d2f2e913bab..05b947a873b8d98614fb488e4bc1c54a1fa8d183 100644 --- a/MotionPlanning/examples/MultiThreadedPlanning/CMakeLists.txt +++ b/MotionPlanning/examples/MultiThreadedPlanning/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( MultiThreadedPlanning ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/MotionPlanning/examples/PlatformDemo/CMakeLists.txt b/MotionPlanning/examples/PlatformDemo/CMakeLists.txt index ced34b205014de3c300eefa57c1dc9ff1a82b9b3..eb0a89c7322c664b80bd58be1231ce3efe79025c 100644 --- a/MotionPlanning/examples/PlatformDemo/CMakeLists.txt +++ b/MotionPlanning/examples/PlatformDemo/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( PlatformDemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/MotionPlanning/examples/RRT/CMakeLists.txt b/MotionPlanning/examples/RRT/CMakeLists.txt index a4147c93c4aa79d4d31e6d0bfc0363d11f12c871..4ef3bdb9d1f999fb17302a31b15e26672d59ac80 100644 --- a/MotionPlanning/examples/RRT/CMakeLists.txt +++ b/MotionPlanning/examples/RRT/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( RRTdemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/MotionPlanning/examples/RrtGui/CMakeLists.txt b/MotionPlanning/examples/RrtGui/CMakeLists.txt index 9c73fd7718736630a7d50e3f10b3f4df5a671ed1..57bb1d6e2f231965066f8d3d7a6a4b65234e1df6 100644 --- a/MotionPlanning/examples/RrtGui/CMakeLists.txt +++ b/MotionPlanning/examples/RrtGui/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( RrtGui ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt b/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt index 6ae90238e75e56e24272ac8e6f1003bededba141..9176158cad67cbe75d8508e3fbc3aa7164ba8428 100644 --- a/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt +++ b/SimDynamics/examples/BulletDebugViewer/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( BulletDebugViewer ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF (SimDynamics_USE_BULLET_USE_GLUT) include_directories(${GLUT_INCLUDE_DIR}) message("GLUT_INCLUDE_DIR:${GLUT_INCLUDE_DIR}") diff --git a/SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt b/SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt index ef2175adcad30239fa2539cb5e2e1d15c05121ce..5786452cf7cd7c6d0425bbfe3f0f0ce2143bed04 100644 --- a/SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt +++ b/SimDynamics/examples/SimDynamicsViewer/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( SimDynamicsViewer ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_USE_COIN_VISUALIZATION) FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/SimDynamicsViewer.cpp ${PROJECT_SOURCE_DIR}/simDynamicsWindow.cpp) diff --git a/VirtualRobot/examples/CameraViewer/CMakeLists.txt b/VirtualRobot/examples/CameraViewer/CMakeLists.txt index 7f715c375da6fa82f230de3241eb8621580eb360..2e8912622ac4b47fe1a861cda8c667e821639018 100644 --- a/VirtualRobot/examples/CameraViewer/CMakeLists.txt +++ b/VirtualRobot/examples/CameraViewer/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( CameraViewer ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/ConstrainedIK/CMakeLists.txt b/VirtualRobot/examples/ConstrainedIK/CMakeLists.txt index 58e9c7c9faa0a556c7f89bdaee35ef3e26542dd0..54ede60475441e75a9094e27313b16384637bac3 100644 --- a/VirtualRobot/examples/ConstrainedIK/CMakeLists.txt +++ b/VirtualRobot/examples/ConstrainedIK/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( ConstrainedIKDemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION AND NLOPT_FOUND) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/GenericIK/CMakeLists.txt b/VirtualRobot/examples/GenericIK/CMakeLists.txt index 84c38f76310dd3e687907addb01d70b45027c0f8..0cd94a61ad59b9128aa0daa6b284d90c0d297923 100644 --- a/VirtualRobot/examples/GenericIK/CMakeLists.txt +++ b/VirtualRobot/examples/GenericIK/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( GenericIKDemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/GraspEditor/CMakeLists.txt b/VirtualRobot/examples/GraspEditor/CMakeLists.txt index f645bdb9e8626dae2cc5afc5b2b921aca37e9b7f..a7c24afe614d98a87f639308a749f80632eece57 100644 --- a/VirtualRobot/examples/GraspEditor/CMakeLists.txt +++ b/VirtualRobot/examples/GraspEditor/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( GraspEditor ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/Jacobi/CMakeLists.txt b/VirtualRobot/examples/Jacobi/CMakeLists.txt index a27d82b303ad5396b73ea93484579dd53667dc1c..f2e1743f8ac4f8a36dc49685073022d0185acbc0 100644 --- a/VirtualRobot/examples/Jacobi/CMakeLists.txt +++ b/VirtualRobot/examples/Jacobi/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( JacobiDemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/ReachabilityMap/CMakeLists.txt b/VirtualRobot/examples/ReachabilityMap/CMakeLists.txt index bcdb5d4b609528bd207275804b2c4343c14a5dbe..476cf3e0eed0611ea82c20611314edb005c500ea 100644 --- a/VirtualRobot/examples/ReachabilityMap/CMakeLists.txt +++ b/VirtualRobot/examples/ReachabilityMap/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( ReachabilityMapDemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/RobotViewer/CMakeLists.txt b/VirtualRobot/examples/RobotViewer/CMakeLists.txt index e9429fad1fdc360be42b8ba2b7ff7224e01c57a5..39c04c6bed5ed4953eeee796b8a9b36680af0312 100644 --- a/VirtualRobot/examples/RobotViewer/CMakeLists.txt +++ b/VirtualRobot/examples/RobotViewer/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( RobotViewer ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/RobotViewerOSG/CMakeLists.txt b/VirtualRobot/examples/RobotViewerOSG/CMakeLists.txt index 293df79a8a74053902d49e476dc447f9ff9f4b34..c31a7702b35dbb400a0e27c7b090248945820b24 100644 --- a/VirtualRobot/examples/RobotViewerOSG/CMakeLists.txt +++ b/VirtualRobot/examples/RobotViewerOSG/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( RobotViewerOSG ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_OPENSCENEGRAPH_VISUALIZATION) diff --git a/VirtualRobot/examples/SceneViewer/CMakeLists.txt b/VirtualRobot/examples/SceneViewer/CMakeLists.txt index 68f30ee1fe80a93ed523222aedf6f15eea24e38d..6274b2b236ecddee6af4961e3519e30506bb9c0e 100644 --- a/VirtualRobot/examples/SceneViewer/CMakeLists.txt +++ b/VirtualRobot/examples/SceneViewer/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( SimoxSceneViewer ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/reachability/CMakeLists.txt b/VirtualRobot/examples/reachability/CMakeLists.txt index c8f1022884b5dc8bcd3d9c39306461690040d1ba..28a82a6dc7bbcab8b7cea9c85f6e908ff915a32f 100644 --- a/VirtualRobot/examples/reachability/CMakeLists.txt +++ b/VirtualRobot/examples/reachability/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( ReachabilityDemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project diff --git a/VirtualRobot/examples/stability/CMakeLists.txt b/VirtualRobot/examples/stability/CMakeLists.txt index 9b96950bb6e37e30fa2072cf2b4914aae9cacdef..ee2755f93633f80c7fefaa72befd60e4e37084b0 100644 --- a/VirtualRobot/examples/stability/CMakeLists.txt +++ b/VirtualRobot/examples/stability/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT ( StabilityDemo ) -INCLUDE(${Simox_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake) - IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION) # the variable "demo_SRCS" contains all .cpp files of this project