[src] Add config.h - use init plugin mechanism - register symbols using *_API macro

Author: th-skam

CMakeLists.txt

@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.12)
 project(CollisionAlgorithm VERSION 0.1 LANGUAGES CXX)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
 find_package(Sofa.Simulation.Core REQUIRED)
 find_package(Sofa.Component.StateContainer REQUIRED)
 find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED)
@@ -11,6 +9,9 @@ find_package(Sofa.GL REQUIRED)
 set(COLLISIONALGORITHM_SRC "src/${PROJECT_NAME}")
 
 set(HEADER_FILES 
+    ${COLLISIONALGORITHM_SRC}/config.h.in
+    ${COLLISIONALGORITHM_SRC}/initCollisionAlgorithm.h
+
     ${COLLISIONALGORITHM_SRC}/BaseAABBBroadPhase.h
     ${COLLISIONALGORITHM_SRC}/BaseAlgorithm.h
     ${COLLISIONALGORITHM_SRC}/BaseElement.h
@@ -61,7 +62,7 @@ set(HEADER_FILES
 )
 
 set(SOURCE_FILES
-    ${COLLISIONALGORITHM_SRC}/initPlugin.cpp
+    ${COLLISIONALGORITHM_SRC}/initCollisionAlgorithm.cpp
 
     ${COLLISIONALGORITHM_SRC}/CollisionPipeline.cpp
 

src/CollisionAlgorithm/config.h.in

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <sofa/config.h>
+#include <sofa/config/sharedlibrary_defines.h>
+
+#define COLLISIONALGORITHM_VERSION @PROJECT_VERSION@
+
+#ifdef SOFA_BUILD_COLLISIONALGORITHM
+#  define SOFA_TARGET @PROJECT_NAME@
+#  define SOFA_COLLISIONALGORITHM_API SOFA_EXPORT_DYNAMIC_LIBRARY
+#else
+#  define SOFA_COLLISIONALGORITHM_API SOFA_IMPORT_DYNAMIC_LIBRARY
+#endif
+
+namespace sofa::collisionalgorithm
+{
+    constexpr const char* MODULE_NAME = "@PROJECT_NAME@";
+    constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@";
+}

src/CollisionAlgorithm/initPlugin.cpp …sionAlgorithm/initCollisionAlgorithm.cppsrc/CollisionAlgorithm/initPlugin.cpp renamed to src/CollisionAlgorithm/initCollisionAlgorithm.cpp src/CollisionAlgorithm/initPlugin.cpp renamed to src/CollisionAlgorithm/initCollisionAlgorithm.cpp

@@ -1,3 +1,5 @@
+#include <CollisionAlgorithm/initCollisionAlgorithm.h>
+
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/helper/system/FileRepository.h>
 #include <sofa/helper/system/PluginManager.h>
@@ -34,28 +36,25 @@ extern void registerPointGeometry(sofa::core::ObjectFactory* factory);
 extern void registerEdgeGeometry(sofa::core::ObjectFactory* factory);
 extern void registerTriangleGeometry(sofa::core::ObjectFactory* factory);
 extern void registerTetrahedronGeometry(sofa::core::ObjectFactory* factory);
-}  // namespace sofa::collisionalgorithm
-
-namespace sofa::component
-{
-
-// Here are just several convenient functions to help user to know what contains the plugin
 
 extern "C"
 {
-    void initExternalModule();
-    const char* getModuleName();
-    const char* getModuleVersion();
-    const char* getModuleLicense();
-    const char* getModuleDescription();
-    void registerObjects(sofa::core::ObjectFactory* factory);
+    SOFA_COLLISIONALGORITHM_API void initExternalModule();
+    SOFA_COLLISIONALGORITHM_API const char* getModuleName();
+    SOFA_COLLISIONALGORITHM_API const char* getModuleVersion();
+    SOFA_COLLISIONALGORITHM_API const char* getModuleLicense();
+    SOFA_COLLISIONALGORITHM_API const char* getModuleDescription();
+    SOFA_COLLISIONALGORITHM_API void registerObjects(sofa::core::ObjectFactory* factory);
 }
 
 void initCollisionAlgorithm() 
 {
     static bool first = true;
     if (first)
     {
+        // make sure that this plugin is registered into the PluginManager
+        sofa::helper::system::PluginManager::getInstance().registerPlugin(MODULE_NAME);
+
         first = false;
 #ifdef PLUGIN_DATA_DIR
         sofa::helper::system::DataRepository.addLastPath(std::string(QUOTE(PLUGIN_DATA_DIR)));
@@ -70,7 +69,7 @@ void initExternalModule()
     initCollisionAlgorithm();
 }
 
-const char* getModuleName() { return "CollisionAlgorithm"; }
+const char* getModuleName() { return MODULE_NAME; }
 
 const char* getModuleVersion()
 {
@@ -87,7 +86,6 @@ const char* getModuleDescription() { return "Plugin for collision detection"; }
 
 void registerObjects(sofa::core::ObjectFactory* factory)
 {
-    using namespace sofa::collisionalgorithm;
     // Register CollisionPipeline
     registerCollisionLoop(factory);
     // Register Algorithms
@@ -107,4 +105,4 @@ void registerObjects(sofa::core::ObjectFactory* factory)
     registerTetrahedronGeometry(factory);
 }
 
-}  // namespace sofa::component
+}  // namespace collisionalgorithm

src/CollisionAlgorithm/initCollisionAlgorithm.h

@@ -0,0 +1,7 @@
+#pragma once
+#include <CollisionAlgorithm/config.h>
+
+namespace collisionalgorithm
+{
+    void SOFA_COLLISIONALGORITHM_API initCollisionAlgorithm();
+} // namespace collisionalgorithm