Changeset 11692 for code/trunk/src/libraries/core/module

Timestamp:

Jan 3, 2018, 1:43:20 AM (7 years ago)

Author:

landauf

Message:

with the latest CMake there are a lot of warnings about the usage of CMP0026. therefore the naming and content of the module/plugin-files had to be changed:
old: <library-filename>.module with content <target-name>
new: <target-name>.module with content <library-filename>
this seems to comply better with cmake and works equally well in c++ (with some small adjustments).
reference: ​https://cmake.org/cmake/help/v3.0/policy/CMP0026.html

File:

• code/trunk/src/libraries/core/module/PluginManager.cc (modified) (2 diffs)

code/trunk/src/libraries/core/module/PluginManager.cc

@@ -28 +28 @@
 
 #include "PluginManager.h"
-
-#include <fstream>
 
 #include "SpecialConfig.h"
@@ -95 +93 @@
     void PluginManager::findPlugins()
     {
-        const std::vector<std::string>& pluginPaths = ApplicationPaths::getInstance().getPluginPaths();
-        for (const std::string& libraryName : pluginPaths)
+        const std::map<std::string, std::string>& pluginPaths = ApplicationPaths::getInstance().getPluginPaths();
+        for (const std::pair<std::string, std::string>& pluginPath : pluginPaths)
         {
-            std::string name;
-            std::string filename = libraryName +  + specialConfig::pluginExtension;
-            std::ifstream infile(filename.c_str());
-            if (infile >> name)
-            {
-                orxout(internal_info) << "Found plugin with name '" << name << "' in module " << libraryName << endl;
-                this->plugins_[name] = new Plugin(name, libraryName);
-            }
-            else
-            {
-                orxout(internal_warning) << "Could not read plugin file " << filename << endl;
-            }
+            const std::string& name = pluginPath.first;
+            const std::string& libraryName = pluginPath.second;
+
+            orxout(internal_info) << "Found plugin with name '" << name << "' in module " << libraryName << endl;
+            this->plugins_[name] = new Plugin(name, libraryName);
         }
     }