Feature #1711

[crea.git] / lib / creaDevManagerLib / modelCDMProject.cpp

diff --git a/lib/creaDevManagerLib/modelCDMProject.cpp b/lib/creaDevManagerLib/modelCDMProject.cpp
index 3966c7ccaac195eb1eec7f51519cb26eee57329d..11ed495072c0783af6106bd9926a73fb6565946d 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMProject.cpp
+++ b/lib/creaDevManagerLib/modelCDMProject.cpp
@@ -94,31 +94,26 @@ modelCDMProject::modelCDMProject(
         {
           //get project version
           std::getline(confFile,word,')');
-          if(word.find("PROJECT_MAJOR_VERSION") != std::string::npos)
+          CDMUtilities::splitter::split(wordBits, word, " ", CDMUtilities::splitter::no_empties);
+          if(wordBits[0] == "PROJECT_MAJOR_VERSION")
             {
-              std::vector<std::string> versionBits;
-              CDMUtilities::splitter::split(versionBits, word, " ", CDMUtilities::splitter::no_empties);
-              version = versionBits[versionBits.size()-1];
+              version = wordBits[1];
             }
-          if(word.find("PROJECT_MINOR_VERSION") != std::string::npos)
+          if(wordBits[0] == "PROJECT_MINOR_VERSION")
             {
-              std::vector<std::string> versionBits;
-              CDMUtilities::splitter::split(versionBits, word, " ", CDMUtilities::splitter::no_empties);
-              version += "." + versionBits[versionBits.size()-1];
+              version += "." + wordBits[1];
             }
-          if(word.find("PROJECT_BUILD_VERSION") != std::string::npos)
+          if(wordBits[0] == "PROJECT_BUILD_VERSION")
             {
-              std::vector<std::string> versionBits;
-              CDMUtilities::splitter::split(versionBits, word, " ", CDMUtilities::splitter::no_empties);
-              version += "." + versionBits[versionBits.size()-1];
+              version += "." + wordBits[1];
             }
 
           //get project versionDate
-          if(word.find("PROJECT_VERSION_DATE") != std::string::npos)
+          if(wordBits[0] == "PROJECT_VERSION_DATE")
             {
               std::vector<std::string> versionBits;
-              CDMUtilities::splitter::split(versionBits, word, " \"", CDMUtilities::splitter::no_empties);
-              versionDate = versionBits[versionBits.size()-1];
+              CDMUtilities::splitter::split(versionBits, wordBits[1], "\"", CDMUtilities::splitter::no_empties);
+              versionDate = versionBits[0];
             }
           //get project buildPath