Revert "update plugin config files"

This reverts commit 7b520c3.

Author: epernod

src/InfinyToolkit/config.h.in

@@ -20,19 +20,11 @@
 #pragma once
 
 #include <sofa/config.h>
-#include <sofa/config/sharedlibrary_defines.h>
-
-#define INFINYTOOLKIT_VERSION @PROJECT_VERSION@
+#define PLUGIN_VERSION @PROJECT_VERSION@
 
 #ifdef SOFA_BUILD_INFINYTOOLKIT
 #  define SOFA_TARGET @PROJECT_NAME@
 #  define SOFA_INFINYTOOLKIT_API SOFA_EXPORT_DYNAMIC_LIBRARY
 #else
 #  define SOFA_INFINYTOOLKIT_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
-
-namespace sofa::infinytoolkit
-{
-    constexpr const char* MODULE_NAME = "@PROJECT_NAME@";
-    constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@";
-} // namespace sofa::infinytoolkit

src/InfinyToolkit/initInfinyToolkit.cpp

@@ -22,6 +22,8 @@
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/helper/system/PluginManager.h>
 
+using sofa::core::ObjectFactory;
+
 namespace sofa::infinytoolkit
 {
 // Haptic and Carving
@@ -56,6 +58,14 @@ extern void registerMotionReplayController(sofa::core::ObjectFactory* factory);
 
 
 
+} // namespace sofa::infinytoolkit
+
+
+namespace sofa::component
+{
+
+using namespace sofa::infinytoolkit;
+
 //Here are just several convenient functions to help user to know what contains the plugin
 extern "C" {
     SOFA_INFINYTOOLKIT_API void initExternalModule();
@@ -85,12 +95,12 @@ void initExternalModule()
 
 const char* getModuleName()
 {
-    return MODULE_NAME;
+    return sofa_tostring(SOFA_TARGET);
 }
 
 const char* getModuleVersion()
 {
-    return MODULE_VERSION;
+    return sofa_tostring(PLUGIN_VERSION);
 }
 
 const char* getModuleLicense()
@@ -137,4 +147,4 @@ void registerObjects(sofa::core::ObjectFactory* factory)
     registerMotionReplayController(factory);
 }
 
-} // namespace sofa::infinytoolkit
+} // namespace sofa::component

src/InfinyToolkit/initInfinyToolkit.h

@@ -20,9 +20,9 @@
 #pragma once
 #include <InfinyToolkit/config.h>
 
-namespace sofa::infinytoolkit
+namespace sofa::component
 {
 
 void SOFA_INFINYTOOLKIT_API initInfinyToolkit();
 
-} // namespace sofa::infinytoolkit
+} // namespace sofa::component