Changeset 11692 for code/trunk/src/libraries/core/Core.cc

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/Core.cc (modified) (1 diff)

code/trunk/src/libraries/core/Core.cc

@@ -281 +281 @@
         orxout(internal_info) << "Loading modules:" << endl;
 
-        const std::vector<std::string>& modulePaths = ApplicationPaths::getInstance().getModulePaths();
-        for (const std::string& modulePath : modulePaths)
-        {
-            ModuleInstance* module = new ModuleInstance(modulePath);
+        const std::map<std::string, std::string>& modulePaths = ApplicationPaths::getInstance().getModulePaths();
+        for (const std::pair<std::string, std::string>& modulePath : modulePaths)
+        {
+            ModuleInstance* module = new ModuleInstance(modulePath.second);
             this->loadModule(module);
             this->modules_.push_back(module);