diff --git a/CMakeLists.txt b/CMakeLists.txt index 493d373ed53c32fcd697368ba6dfb454faab6595..0696f8e6f78852310730ff5af776fbe0a8db88f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ FIND_PACKAGE(Boost COMPONENTS program_options thread unit_test_framework + regex REQUIRED) MESSAGE (STATUS "Boost found at: ${Boost_INCLUDE_DIR}") diff --git a/CMakeModules/SimoxConfig.cmake.in b/CMakeModules/SimoxConfig.cmake.in index b521a0c4245e9f3afb32124a67c6186f424ae8cc..2058e66e48114d9284a999c72d7de92d98f0e7c7 100644 --- a/CMakeModules/SimoxConfig.cmake.in +++ b/CMakeModules/SimoxConfig.cmake.in @@ -57,8 +57,16 @@ SET(SimDynamics_USE_BULLET "@SimDynamics_USE_BULLET@") SET(SimDynamics_USE_BULLET_DOUBLE_PRECISION "@SimDynamics_USE_BULLET_DOUBLE_PRECISION@") +FIND_PACKAGE(Eigen3 QUIET) FIND_PACKAGE(Qt5 5.5.0 COMPONENTS OpenGL Core Gui Widgets QUIET) -FIND_PACKAGE(Boost COMPONENTS filesystem system program_options thread QUIET) +FIND_PACKAGE(Boost COMPONENTS + filesystem + system + program_options + thread + unit_test_framework + regex + QUIET) diff --git a/SimoxUtility/CMakeLists.txt b/SimoxUtility/CMakeLists.txt index 5c535ba38db7e53321e081417b41197ccc446577..57b258402c6e48e3e105dab269585e36365ae90e 100644 --- a/SimoxUtility/CMakeLists.txt +++ b/SimoxUtility/CMakeLists.txt @@ -17,14 +17,11 @@ target_link_libraries(SimoxUtility PUBLIC stdc++fs) target_include_directories(SimoxUtility SYSTEM PUBLIC ${Eigen3_INCLUDE_DIR}) #### BOOST -#FIND_PACKAGE(Boost COMPONENTS REQUIRED) -#MESSAGE (STATUS "Boost found at: ${Boost_INCLUDE_DIR}") - -#target_include_directories(SimoxUtility PUBLIC ${Boost_INCLUDE_DIR}) target_link_libraries(SimoxUtility PUBLIC Boost::boost Boost::program_options Boost::thread + Boost::regex ) # disable boost auto linking diff --git a/VirtualRobot/CMakeLists.txt b/VirtualRobot/CMakeLists.txt index 606f1585b1f93698e86c5c96456620abb9bfbf4d..38ba6c3f36099c049ef134943643b38f14491356 100644 --- a/VirtualRobot/CMakeLists.txt +++ b/VirtualRobot/CMakeLists.txt @@ -33,12 +33,6 @@ if (Simox_USE_NLOPT) endif () endif () -#### Eigen - -#### BOOST -FIND_PACKAGE(Boost COMPONENTS filesystem system program_options thread REQUIRED) - - ########################################## #### VISUALIZATION Coin3D+Qt+SoQt / OSG+Qt