From 90fa58a51a5d752ebfe0ace8589fb539a4a3e0d1 Mon Sep 17 00:00:00 2001 From: Fabian Reister <fabian.reister@kit.edu> Date: Wed, 28 Dec 2022 12:21:35 +0100 Subject: [PATCH] CMake: registering new lib GeometricPlanning --- CMakeLists.txt | 9 +++++++++ CMakeModules/SimoxConfig.cmake.in | 3 +++ 2 files changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa900db47..ee9acc0c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,6 +116,7 @@ set (Simox_BUILD_VirtualRobot TRUE CACHE BOOL "Build Virtual Robot library") set (Simox_BUILD_Saba TRUE CACHE BOOL "Build Motion Planning library") set (Simox_BUILD_GraspStudio TRUE CACHE BOOL "Build Grasp Planning library") set (Simox_BUILD_SimDynamics TRUE CACHE BOOL "Build Dynamic Simulation") +set (Simox_BUILD_GeometricPlanning TRUE CACHE BOOL "Build Geometric Planning Library") MESSAGE (STATUS "** SIMOX BUILD SimoxUtility: TRUE (can't be turned off)") MESSAGE (STATUS "** SIMOX BUILD SimoxQtUtility: TRUE (can't be turned off)") @@ -123,6 +124,7 @@ MESSAGE (STATUS "** SIMOX BUILD VirtualRobot: ${Simox_BUILD_VirtualRobot}") MESSAGE (STATUS "** SIMOX BUILD Saba : ${Simox_BUILD_Saba}") MESSAGE (STATUS "** SIMOX BUILD GraspStudio : ${Simox_BUILD_GraspStudio}") MESSAGE (STATUS "** SIMOX BUILD SimDynamics : ${Simox_BUILD_SimDynamics}") +MESSAGE (STATUS "** SIMOX BUILD GeometricPlanning : ${GeometricPlanning}") ############################# SETUP PATHS ############################# if(WIN32 AND NOT CYGWIN) set(INSTALL_CMAKE_DIR CMake CACHE PATH "Installation directory for CMake files") @@ -246,6 +248,13 @@ if (Simox_BUILD_GraspStudio) list (APPEND Simox_LIBRARIES GraspStudio) endif() +####################################################################################### +if (Simox_BUILD_GeometricPlanning) + add_subdirectory(GeometricPlanning) + list(APPEND SIMOX_EXPORT_TARGET_LIST GeometricPlanning) + list (APPEND Simox_LIBRARIES GeometricPlanning) +endif() + ####################################################################################### if (Simox_BUILD_SimDynamics) find_package(Bullet QUIET) diff --git a/CMakeModules/SimoxConfig.cmake.in b/CMakeModules/SimoxConfig.cmake.in index bb5d26836..34a071457 100644 --- a/CMakeModules/SimoxConfig.cmake.in +++ b/CMakeModules/SimoxConfig.cmake.in @@ -70,6 +70,9 @@ FIND_PACKAGE(Boost ${Simox_BOOST_VERSION} EXACT COMPONENTS regex QUIET) +find_package(doctest QUIET) + + FIND_PACKAGE(SoQt QUIET) if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY)) -- GitLab