sofa-framework · hugtalbot · Oct 23, 2019 · Sep 17, 2019 · Sep 17, 2019 · Sep 17, 2019
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -230,6 +230,9 @@ add_subdirectory(SofaGeneral)
 add_subdirectory(SofaAdvanced)
 add_subdirectory(SofaMisc)
 
+## Packages
+add_subdirectory(applications/collections)
+
 # This is all the applications GUI stuff. As there is a dependency to this one
 # In scene creator and SofaPython...it is located here.
 add_subdirectory(SofaGui)
@@ -278,9 +281,6 @@ endif()
 ## Plugins
 add_subdirectory(applications/plugins)
 
-## Packages
-add_subdirectory(applications/packages)
-
 ## Applications
 add_subdirectory(applications/projects)
 

diff --git a/SofaAdvanced/CMakeLists.txt b/SofaAdvanced/CMakeLists.txt
@@ -12,7 +12,7 @@ set(SOFAADVANCED_TARGETS
     SofaNonUniformFem
 )
 
-foreach(TARGET ${SOFAADVANCED_TARGETS} SofaComponentAdvanced)
+foreach(TARGET ${SOFAADVANCED_TARGETS})
     add_subdirectory(../modules/${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET})
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../modules>")
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")

diff --git a/SofaAdvanced/SofaAdvancedConfig.cmake.in b/SofaAdvanced/SofaAdvancedConfig.cmake.in
@@ -2,13 +2,15 @@
 
 @PACKAGE_INIT@
 
+set(SOFAADVANCED_TARGETS @SOFAADVANCED_TARGETS@)
+
 find_package(SofaGeneral REQUIRED)
 
-foreach(target @SOFAADVANCED_TARGETS@ SofaComponentAdvanced)
+foreach(target ${SOFAADVANCED_TARGETS})
     if(NOT TARGET ${target})
         include("${CMAKE_CURRENT_LIST_DIR}/SofaAdvancedTargets.cmake")
         break()
     endif()
 endforeach()
 
-check_required_components(@SOFAADVANCED_TARGETS@ SofaComponentAdvanced)
+check_required_components(${SOFAADVANCED_TARGETS})
diff --git a/SofaAdvanced/config.h.in b/SofaAdvanced/config.h.in
@@ -31,11 +31,4 @@
 #  define SOFA_NON_UNIFORM_FEM_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-#ifdef SOFA_BUILD_COMPONENT_ADVANCED
-#  define SOFA_TARGET SofaComponentAdvanced
-#  define SOFA_COMPONENT_ADVANCED_API SOFA_EXPORT_DYNAMIC_LIBRARY
-#else
-#  define SOFA_COMPONENT_ADVANCED_API SOFA_IMPORT_DYNAMIC_LIBRARY
-#endif
-
 #endif
diff --git a/SofaGeneral/CMakeLists.txt b/SofaGeneral/CMakeLists.txt
@@ -39,7 +39,7 @@ if(Newmat_FOUND)
 endif()
 sofa_set_01(SOFAGENERAL_HAVE_SOFADENSESOLVER VALUE ${Newmat_FOUND})
 
-foreach(TARGET ${SOFAGENERAL_TARGETS} SofaComponentGeneral)
+foreach(TARGET ${SOFAGENERAL_TARGETS})
     add_subdirectory(../modules/${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET})
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../modules>")
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")

diff --git a/SofaGeneral/SofaGeneralConfig.cmake.in b/SofaGeneral/SofaGeneralConfig.cmake.in
@@ -2,6 +2,8 @@
 
 @PACKAGE_INIT@
 
+set(SOFAGENERAL_TARGETS @SOFAGENERAL_TARGETS@)
+
 set(SOFAGENERAL_HAVE_SOFADENSESOLVER @SOFAGENERAL_HAVE_SOFADENSESOLVER@)
 set(SOFADENSESOLVER_HAVE_NEWMAT @SOFADENSESOLVER_HAVE_NEWMAT@)
 set(SOFAGENERALLOADER_HAVE_ZLIB @SOFAGENERALLOADER_HAVE_ZLIB@)
@@ -15,11 +17,11 @@ if(SOFAGENERALLOADER_HAVE_ZLIB)
     find_package(ZLIB QUIET REQUIRED)
 endif()
 
-foreach(target @SOFAGENERAL_TARGETS@ SofaComponentGeneral)
+foreach(target ${SOFAGENERAL_TARGETS})
     if(NOT TARGET ${target})
         include("${CMAKE_CURRENT_LIST_DIR}/SofaGeneralTargets.cmake")
         break()
     endif()
 endforeach()
 
-check_required_components(@SOFAGENERAL_TARGETS@ SofaComponentGeneral)
+check_required_components(${SOFAGENERAL_TARGETS})
diff --git a/SofaGeneral/config.h.in b/SofaGeneral/config.h.in
@@ -117,13 +117,6 @@
 #  define SOFA_BOUNDARY_CONDITION_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-#ifdef SOFA_BUILD_COMPONENT_GENERAL
-#  define SOFA_TARGET SofaComponentGeneral
-#  define SOFA_COMPONENT_GENERAL_API SOFA_EXPORT_DYNAMIC_LIBRARY
-#else
-#  define SOFA_COMPONENT_GENERAL_API SOFA_IMPORT_DYNAMIC_LIBRARY
-#endif
-
 #ifdef SOFA_BUILD_GENERAL_LINEAR_SOLVER
 #  define SOFA_TARGET SofaGeneralLinearSolver
 #  define SOFA_GENERAL_LINEAR_SOLVER_API SOFA_EXPORT_DYNAMIC_LIBRARY

diff --git a/SofaGui/SofaGuiConfig.cmake.in b/SofaGui/SofaGuiConfig.cmake.in
@@ -2,6 +2,8 @@
 
 @PACKAGE_INIT@
 
+set(SOFAGUI_TARGETS @SOFAGUI_TARGETS@)
+
 set(SOFAGUI_HAVE_SOFAHEADLESSRECORDER @SOFAGUI_HAVE_SOFAHEADLESSRECORDER@)
 set(SOFAGUI_HAVE_SOFAGUIQT @SOFAGUI_HAVE_SOFAGUIQT@)
 set(SOFAGUIQT_HAVE_QTVIEWER @SOFAGUIQT_HAVE_QTVIEWER@)
@@ -29,11 +31,11 @@ if(SOFAGUI_HAVE_SOFAGUIQT)
     endif()
 endif()
 
-foreach(target @SOFAGUI_TARGETS@)
+foreach(target ${SOFAGUI_TARGETS})
     if(NOT TARGET ${target})
         include("${CMAKE_CURRENT_LIST_DIR}/SofaGuiTargets.cmake")
         break()
     endif()
 endforeach()
 
-check_required_components(@SOFAGUI_TARGETS@)
+check_required_components(${SOFAGUI_TARGETS})
diff --git a/SofaKernel/SofaBase/CMakeLists.txt b/SofaKernel/SofaBase/CMakeLists.txt
@@ -16,7 +16,7 @@ set(SOFABASE_TARGETS
     SofaBaseVisual
 )
 
-foreach(TARGET ${SOFABASE_TARGETS} SofaComponentBase)
+foreach(TARGET ${SOFABASE_TARGETS})
     add_subdirectory(../modules/${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET})
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../modules>")
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")

diff --git a/SofaKernel/SofaBase/SofaBaseConfig.cmake.in b/SofaKernel/SofaBase/SofaBaseConfig.cmake.in
@@ -2,13 +2,15 @@
 
 @PACKAGE_INIT@
 
+set(SOFABASE_TARGETS @SOFABASE_TARGETS@)
+
 find_package(SofaSimulation REQUIRED)
 
-foreach(target @SOFABASE_TARGETS@ SofaComponentBase)
+foreach(target ${SOFABASE_TARGETS})
     if(NOT TARGET ${target})
         include("${CMAKE_CURRENT_LIST_DIR}/SofaBaseTargets.cmake")
         break()
     endif()
 endforeach()
 
-check_required_components(@SOFABASE_TARGETS@)
+check_required_components(${SOFABASE_TARGETS})
diff --git a/SofaKernel/SofaBase/config.h.in b/SofaKernel/SofaBase/config.h.in
@@ -59,11 +59,4 @@
 #  define SOFA_BASE_VISUAL_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-#ifdef SOFA_BUILD_COMPONENT_BASE
-#  define SOFA_TARGET SofaComponentBase
-#  define SOFA_COMPONENT_BASE_API SOFA_EXPORT_DYNAMIC_LIBRARY
-#else
-#  define SOFA_COMPONENT_BASE_API SOFA_IMPORT_DYNAMIC_LIBRARY
-#endif
-
 #endif
diff --git a/SofaKernel/SofaCommon/CMakeLists.txt b/SofaKernel/SofaCommon/CMakeLists.txt
@@ -21,7 +21,7 @@ set(SOFACOMMON_TARGETS
     SofaEigen2Solver
 )
 
-foreach(TARGET ${SOFACOMMON_TARGETS} SofaComponentCommon)
+foreach(TARGET ${SOFACOMMON_TARGETS})
     add_subdirectory(../modules/${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET})
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../modules>")
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")

diff --git a/SofaKernel/SofaCommon/SofaCommonConfig.cmake.in b/SofaKernel/SofaCommon/SofaCommonConfig.cmake.in
@@ -2,13 +2,15 @@
 
 @PACKAGE_INIT@
 
+set(SOFACOMMON_TARGETS @SOFACOMMON_TARGETS@)
+
 find_package(SofaBase REQUIRED SofaComponentBase)
 
-foreach(target @SOFACOMMON_TARGETS@ SofaComponentCommon)
+foreach(target ${SOFACOMMON_TARGETS})
     if(NOT TARGET ${target})
         include("${CMAKE_CURRENT_LIST_DIR}/SofaCommonTargets.cmake")
         break()
     endif()
 endforeach()
 
-check_required_components(@SOFACOMMON_TARGETS@)
+check_required_components(${SOFACOMMON_TARGETS})
diff --git a/SofaKernel/SofaCommon/config.h.in b/SofaKernel/SofaCommon/config.h.in
@@ -94,12 +94,5 @@
 #  define SOFA_EIGEN2_SOLVER_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-#ifdef SOFA_BUILD_COMPONENT_COMMON
-#  define SOFA_TARGET    SofaComponentCommon
-#  define SOFA_COMPONENT_COMMON_API SOFA_EXPORT_DYNAMIC_LIBRARY
-#else
-#  define SOFA_COMPONENT_COMMON_API SOFA_IMPORT_DYNAMIC_LIBRARY
-#endif
-
 
 #endif
diff --git a/SofaKernel/SofaFramework/SofaMacros.cmake b/SofaKernel/SofaFramework/SofaMacros.cmake
@@ -94,6 +94,7 @@ endmacro()
 macro(sofa_add_generic directory name type)
     if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${directory}" AND IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/${directory}")
         string(TOUPPER ${type}_${name} option)
+        string(TOLOWER ${type} type_lower)
 
         # optional parameter to activate/desactivate the option
         #  e.g.  sofa_add_application( path/MYAPP MYAPP APPLICATION ON)
@@ -104,9 +105,9 @@ macro(sofa_add_generic directory name type)
             endif()
         endif()
 
-        option(${option} "Build the ${name} ${type}." ${active})
+        option(${option} "Build the ${name} ${type_lower}." ${active})
         if(${option})
-            message("Adding ${type} ${name}")
+            message("Adding ${type_lower} ${name}")
             add_subdirectory(${directory})
             #Check if the target has been successfully added
             if(TARGET ${name})
@@ -131,22 +132,23 @@ macro(sofa_add_generic directory name type)
             set_property(GLOBAL APPEND PROPERTY __GlobalTargetNameList__ ${option})
         endif()
     else()
-        message("${type} ${name} (${CMAKE_CURRENT_LIST_DIR}/${directory}) does not exist and will be ignored.")
+        message("The ${type_lower} ${name} (${CMAKE_CURRENT_LIST_DIR}/${directory}) does not exist and will be ignored.")
     endif()
 endmacro()
 
+macro(sofa_add_collection directory name)
+    sofa_add_generic( ${directory} ${name} "Collection" ${ARGV2} )
+endmacro()
 
 macro(sofa_add_plugin directory plugin_name)
     sofa_add_generic( ${directory} ${plugin_name} "Plugin" ${ARGV2} )
 endmacro()
 
-
 macro(sofa_add_plugin_experimental directory plugin_name)
     sofa_add_generic( ${directory} ${plugin_name} "Plugin" ${ARGV2} )
     message("-- ${plugin_name} is an experimental feature, use it at your own risk.")
 endmacro()
 
-
 macro(sofa_add_module directory module_name)
     sofa_add_generic( ${directory} ${module_name} "Module" ${ARGV2} )
 endmacro()
@@ -186,6 +188,8 @@ function(sofa_add_generic_external directory name type)
         return()
     endif()
 
+    string(TOLOWER ${type} type_lower)
+
     # Default value for fetch activation and for plugin activation (if adding a plugin)
     set(active OFF)
     set(optional_argv3 "${ARGV3}")
@@ -202,7 +206,7 @@ function(sofa_add_generic_external directory name type)
 
     # Fetch
     if(${fetch_enabled})
-        message("Fetching ${type} ${name}")
+        message("Fetching ${type_lower} ${name}")
 
         if(NOT EXISTS ${fetched_dir})
             file(MAKE_DIRECTORY ${fetched_dir})

diff --git a/SofaKernel/SofaSimulation/SofaSimulationConfig.cmake.in b/SofaKernel/SofaSimulation/SofaSimulationConfig.cmake.in
@@ -2,13 +2,15 @@
 
 @PACKAGE_INIT@
 
+set(SOFASIMULATION_TARGETS @SOFASIMULATION_TARGETS@)
+
 find_package(SofaFramework REQUIRED)
 
-foreach(target @SOFASIMULATION_TARGETS@)
+foreach(target ${SOFASIMULATION_TARGETS})
     if(NOT TARGET ${target})
         include("${CMAKE_CURRENT_LIST_DIR}/SofaSimulationTargets.cmake")
         break()
     endif()
 endforeach()
 
-check_required_components(@SOFASIMULATION_TARGETS@)
+check_required_components(${SOFASIMULATION_TARGETS})
diff --git a/SofaKernel/framework/sofa/helper/system/gl.h b/SofaKernel/framework/sofa/helper/system/gl.h
@@ -22,10 +22,10 @@
 #ifndef SOFA_HELPER_SYSTEM_GL_H
 #define SOFA_HELPER_SYSTEM_GL_H
 
+#include <sofa/helper/system/config.h>
+
 #ifndef SOFA_NO_OPENGL
 
-#include <sofa/helper/helper.h>
-#include <sofa/helper/system/config.h>
 #include <string>
 
 #  include <GL/glew.h>

diff --git a/SofaKernel/modules/SofaBaseMechanics/SofaBaseMechanics_test/DiagonalMass_test.cpp b/SofaKernel/modules/SofaBaseMechanics/SofaBaseMechanics_test/DiagonalMass_test.cpp
@@ -91,7 +91,7 @@ class DiagonalMass_test : public BaseTest
 
     void SetUp() override
     {
-        sofa::simpleapi::importPlugin("SofaAllCommonComponents") ;
+        sofa::simpleapi::importPlugin("SofaComponentAll") ;
 
         component::initBaseMechanics();
         simulation::setSimulation(simulation = new simulation::graph::DAGSimulation());

diff --git a/SofaKernel/modules/SofaBaseMechanics/SofaBaseMechanics_test/UniformMass_test.cpp b/SofaKernel/modules/SofaBaseMechanics/SofaBaseMechanics_test/UniformMass_test.cpp
@@ -84,7 +84,7 @@ struct UniformMassTest :  public BaseTest
 
     virtual void SetUp()
     {
-        sofa::simpleapi::importPlugin("SofaAllCommonComponents") ;
+        sofa::simpleapi::importPlugin("SofaComponentAll") ;
 
         todo = true ;
         initBaseMechanics();

diff --git a/SofaKernel/modules/SofaComponentCommon/CMakeLists.txt b/SofaKernel/modules/SofaComponentCommon/CMakeLists.txt
diff --git a/SofaKernel/modules/SofaDeformable/SofaDeformable_test/RestShapeSpringsForceField_test.cpp b/SofaKernel/modules/SofaDeformable/SofaDeformable_test/RestShapeSpringsForceField_test.cpp
@@ -55,7 +55,7 @@ RestStiffSpringsForceField_test::~RestStiffSpringsForceField_test()
 
 sofa::Node::SPtr RestStiffSpringsForceField_test::createScene(const std::string& type)
 {
-    importPlugin("SofaAllCommonComponents");
+    importPlugin("SofaComponentAll");
     auto theSimulation = createSimulation();
     auto theRoot = createRootNode(theSimulation, "root");
 

diff --git a/SofaKernel/modules/sofa/frameworkextra/frameworkextra_test/CMakeLists.txt b/SofaKernel/modules/sofa/frameworkextra/frameworkextra_test/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.1)
 
 project(SofaFrameworkExtra_test)
 
+find_package(SofaComponentBase REQUIRED)
+
 set(SOURCE_FILES
     core/TrackedData_test.cpp
     core/objectmodel/Base_test.cpp
@@ -14,6 +16,6 @@ set(SOURCE_FILES
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 add_definitions("-DSOFAFRAMEWORKEXTRA_TEST_SCENES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/scenes\"")
-target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper)
+target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaComponentBase)
 
 add_test(NAME SofaFrameworkExtra_test COMMAND SofaFrameworkExtra_test)
diff --git a/...nel/modules/sofa/frameworkextra/frameworkextra_test/core/objectmodel/BaseContext_test.cpp b/...nel/modules/sofa/frameworkextra/frameworkextra_test/core/objectmodel/BaseContext_test.cpp
@@ -40,7 +40,7 @@ class BaseContext_test: public BaseSimulationTest
     void testGetObjects()
     {
         EXPECT_MSG_NOEMIT(Error, Warning) ;
-        importPlugin("SofaAllCommonComponents") ;
+        importPlugin("SofaComponentAll") ;
         std::stringstream scene ;
         scene << "<?xml version='1.0'?>"
                  "<Node name='Root' gravity='0 -9.81 0' time='0' animate='0' >               \n"

diff --git a/SofaKernel/modules/sofa/frameworkextra/frameworkextra_test/simulation/Node_test.cpp b/SofaKernel/modules/sofa/frameworkextra/frameworkextra_test/simulation/Node_test.cpp
@@ -44,7 +44,7 @@ class NodeContext_test: public BaseSimulationTest
 
     NodeContext_test()
     {
-        importPlugin("SofaAllCommonComponents") ;
+        importPlugin("SofaComponentAll") ;
     }
 
     void testGetNodeObjects()

diff --git a/SofaMisc/CMakeLists.txt b/SofaMisc/CMakeLists.txt
@@ -18,7 +18,7 @@ set(SOFAMISC_TARGETS
     SofaMiscTopology
 )
 
-foreach(TARGET ${SOFAMISC_TARGETS} SofaComponentMisc)
+foreach(TARGET ${SOFAMISC_TARGETS})
     add_subdirectory(../modules/${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET})
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../modules>")
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")