[CMake] ADD SofaSparseSolver and SofaPreconditioner to package

sofa-framework · Oct 18, 2018 · 6b749df · 6b749df
1 parent 38b3bac
commit 6b749df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/applications/projects/runSofa/CMakeLists.txt b/applications/projects/runSofa/CMakeLists.txt
@@ -65,7 +65,7 @@ if(APPLE AND SOFA_BUILD_RELEASE_PACKAGE)
     find_package(CImgPlugin REQUIRED)
     find_package(SofaMiscCollision REQUIRED)
     find_package(SofaPython REQUIRED)
-    target_link_libraries(${PROJECT_NAME} SofaAllCommonComponents CImgPlugin SofaMiscCollision SofaPython)
+    target_link_libraries(${PROJECT_NAME} SofaAllCommonComponents CImgPlugin SofaMiscCollision SofaPython SofaSparseSolver SofaPreconditioner)
     set_property(GLOBAL PROPERTY RUNSOFA_CPACK_COMPONENTS_ALL BundlePack)
     include(cmake/bundle.cmake)
 else()

diff --git a/package.cmake b/package.cmake
@@ -31,20 +31,22 @@ setSofaOption(SOFA_USE_MASK OFF)
 setSofaOption(SOFA_BUILD_TESTS OFF)
 setSofaOption(SOFA_BUILD_TUTORIALS OFF)
 
-# Set all plugins OFF
+# Set all plugins/modules OFF
 get_cmake_property(_variableNames VARIABLES)
 list (SORT _variableNames)
 foreach (_variableName ${_variableNames})
-    if(_variableName MATCHES "^PLUGIN_")
+    if(_variableName MATCHES "^PLUGIN_" OR _variableName MATCHES "^MODULE_")
         setSofaOption(${_variableName} OFF)
     endif()
 endforeach()
 
-# Set some plugins ON
+# Set some plugins/modules ON
 setSofaOption(PLUGIN_SOFAALLCOMMONCOMPONENTS ON)
 setSofaOption(PLUGIN_CIMGPLUGIN ON)
 setSofaOption(PLUGIN_SOFAPYTHON ON)
 setSofaOption(PLUGIN_SOFAMISCCOLLISION ON)
+setSofaOption(MODULE_SOFASPARSESOLVER ON)
+setSofaOption(MODULE_SOFAPRECONDITIONER ON)
 
 # Copy resources files (etc/, share/, examples/) when installing 
 setSofaOption(SOFA_INSTALL_RESOURCES_FILES ON)