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

Timestamp:

Jan 3, 2018, 1:43:20 AM (6 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/ApplicationPaths.cc (modified) (3 diffs)

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

@@ -32 +32 @@
 #include <cstdlib>
 #include <cstdio>
+#include <fstream>
 #include <vector>
 #include <boost/filesystem.hpp>
@@ -169 +170 @@
     }
 
-    std::vector<std::string> ApplicationPaths::getModulePaths()
+    std::map<std::string, std::string> ApplicationPaths::getModulePaths()
     {
         return this->getModuleOrPluginPaths(modulePath_, specialConfig::moduleExtension);
     }
 
-    std::vector<std::string> ApplicationPaths::getPluginPaths()
+    std::map<std::string, std::string> ApplicationPaths::getPluginPaths()
     {
         return this->getModuleOrPluginPaths(pluginPath_, specialConfig::pluginExtension);
     }
 
-    std::vector<std::string> ApplicationPaths::getModuleOrPluginPaths(boost::filesystem::path& directory, const std::string& extension)
-    {
-        std::vector<std::string> paths;
+    std::map<std::string, std::string> ApplicationPaths::getModuleOrPluginPaths(boost::filesystem::path& directory, const std::string& extension)
+    {
+        std::map<std::string, std::string> paths;
 
         // We search for helper files with the following extension
@@ -204 +205 @@
                 {
                     // We've found a helper file
-                    const std::string& library = filename.substr(0, filename.size() - extensionlength);
-                    paths.push_back(directory.BF_GENERIC_STRING() + '/' + library);
+                    const std::string& moduleName = filename.substr(0, filename.size() - extensionlength);
+
+                    // Read it's content to get the library's name
+                    std::ifstream infile(file->path().string().c_str());
+                    std::string libraryName;
+                    if (infile >> libraryName)
+                    {
+                        std::string libraryPath = directory.BF_GENERIC_STRING() + '/' + libraryName;
+                        paths[moduleName] = libraryPath;
+                    }
+                    else
+                    {
+                        orxout(internal_warning) << "Could not file " << filename << endl;
+                    }
                 }
             }