From 7aff26b80d85937bb75033ade04f8007c43ab14e Mon Sep 17 00:00:00 2001 From: Alexander Turkin Date: Mon, 22 Feb 2021 07:30:16 +0300 Subject: [PATCH 1/2] one cmake option per one extra package --- Extras/CMakeLists.txt | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt index fc0d22604..3c9b4826d 100644 --- a/Extras/CMakeLists.txt +++ b/Extras/CMakeLists.txt @@ -1,5 +1,36 @@ -SUBDIRS( InverseDynamics BulletRoboticsGUI BulletRobotics obj2sdf Serialize ConvexDecomposition HACD GIMPACTUtils ) +OPTION(BUILD_INVERSE_DYNAMIC_EXTRA "Build InverseDynamic extra module, only applied when BUILD_EXTRAS is ON") +OPTION(BUILD_BULLET_ROBOTICS_GUI_EXTRA "Build BulletRoboticsGUI extra module, only applied when BUILD_EXTRAS is ON") +OPTION(BUILD_BULLET_ROBOTICS_EXTRA "Build BulletRobotics extra module, only applied when BUILD_EXTRAS is ON") +OPTION(BUILD_OBJ2SDF_EXTRA "Build obj2sdf extra module, only applied when BUILD_EXTRAS is ON") +OPTION(BUILD_SERIALIZE_EXTRA "Build Serialize extra module, only applied when BUILD_EXTRAS is ON") +OPTION(BUILD_CONVEX_DECOMPOSITION_EXTRA "Build ConvexDecomposition extra module, only applied when BUILD_EXTRAS is ON") +OPTION(BUILD_HACD_EXTRA "Build HACD extra module, only applied when BUILD_EXTRAS is ON") +OPTION(BUILD_GIMPACTUTILS_EXTRA "Build GIMPACTUtils extra module, only applied when BUILD_EXTRAS is ON") +IF(BUILD_INVERSE_DYNAMIC_EXTRA) + SUBDIRS( InverseDynamics ) +ENDIF() +IF(BUILD_BULLET_ROBOTICS_GUI_EXTRA) + SUBDIRS( BulletRoboticsGUI ) +ENDIF() +IF(BUILD_BULLET_ROBOTICS_EXTRA) + SUBDIRS( BulletRobotics ) +ENDIF() +IF(BUILD_OBJ2SDF_EXTRA) + SUBDIRS( obj2sdf ) +ENDIF() +IF(BUILD_SERIALIZE_EXTRA) + SUBDIRS( Serialize ) +ENDIF() +IF(BUILD_CONVEX_DECOMPOSITION_EXTRA) + SUBDIRS( ConvexDecomposition ) +ENDIF() +IF(BUILD_HACD_EXTRA) + SUBDIRS( HACD ) +ENDIF() +IF(BUILD_GIMPACTUTILS_EXTRA) + SUBDIRS( GIMPACTUtils ) +ENDIF() #Maya Dynamica plugin is moved to http://dynamica.googlecode.com From f26e85815479ec1f35d3b37beece20b09f0352a0 Mon Sep 17 00:00:00 2001 From: Alexander Turkin Date: Wed, 14 Apr 2021 13:42:43 +0300 Subject: [PATCH 2/2] added default ON values for cmake OPTIONS to fix linker errors on ci builds --- Extras/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt index 3c9b4826d..58a161a45 100644 --- a/Extras/CMakeLists.txt +++ b/Extras/CMakeLists.txt @@ -1,11 +1,11 @@ -OPTION(BUILD_INVERSE_DYNAMIC_EXTRA "Build InverseDynamic extra module, only applied when BUILD_EXTRAS is ON") -OPTION(BUILD_BULLET_ROBOTICS_GUI_EXTRA "Build BulletRoboticsGUI extra module, only applied when BUILD_EXTRAS is ON") -OPTION(BUILD_BULLET_ROBOTICS_EXTRA "Build BulletRobotics extra module, only applied when BUILD_EXTRAS is ON") -OPTION(BUILD_OBJ2SDF_EXTRA "Build obj2sdf extra module, only applied when BUILD_EXTRAS is ON") -OPTION(BUILD_SERIALIZE_EXTRA "Build Serialize extra module, only applied when BUILD_EXTRAS is ON") -OPTION(BUILD_CONVEX_DECOMPOSITION_EXTRA "Build ConvexDecomposition extra module, only applied when BUILD_EXTRAS is ON") -OPTION(BUILD_HACD_EXTRA "Build HACD extra module, only applied when BUILD_EXTRAS is ON") -OPTION(BUILD_GIMPACTUTILS_EXTRA "Build GIMPACTUtils extra module, only applied when BUILD_EXTRAS is ON") +OPTION(BUILD_INVERSE_DYNAMIC_EXTRA "Build InverseDynamic extra module, only applied when BUILD_EXTRAS is ON" ON) +OPTION(BUILD_BULLET_ROBOTICS_GUI_EXTRA "Build BulletRoboticsGUI extra module, only applied when BUILD_EXTRAS is ON" ON) +OPTION(BUILD_BULLET_ROBOTICS_EXTRA "Build BulletRobotics extra module, only applied when BUILD_EXTRAS is ON" ON) +OPTION(BUILD_OBJ2SDF_EXTRA "Build obj2sdf extra module, only applied when BUILD_EXTRAS is ON" ON) +OPTION(BUILD_SERIALIZE_EXTRA "Build Serialize extra module, only applied when BUILD_EXTRAS is ON" ON) +OPTION(BUILD_CONVEX_DECOMPOSITION_EXTRA "Build ConvexDecomposition extra module, only applied when BUILD_EXTRAS is ON" ON) +OPTION(BUILD_HACD_EXTRA "Build HACD extra module, only applied when BUILD_EXTRAS is ON" ON) +OPTION(BUILD_GIMPACTUTILS_EXTRA "Build GIMPACTUtils extra module, only applied when BUILD_EXTRAS is ON" ON) IF(BUILD_INVERSE_DYNAMIC_EXTRA) SUBDIRS( InverseDynamics )