X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMApplication.cpp;h=c0d3b4620195ea526fef79d41b3960a7d321e898;hb=38fb78e3930c8ba01021536630624e4b0b03dd87;hp=f7f7431bdd3af8cec850e6974767f13031f28ac3;hpb=9877d27eb9a1339d97bc8e13ec5f1f75a5dc9e3f;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp
index f7f7431..c0d3b46 100644
--- a/lib/creaDevManagerLib/modelCDMApplication.cpp
+++ b/lib/creaDevManagerLib/modelCDMApplication.cpp
@@ -559,37 +559,40 @@ std::map<std::string, bool> modelCDMApplication::Get3rdPartyLibraries()
 
   if (this->HasCMakeLists())
     {
-      CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str());
-      // look at every syntax element
-      for (int i = 0; i < cmlFile.size(); ++i)
+
+      std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str());
+
+      boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES(([\\s]|#[^\\n]*\\n)+([\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)");
+      std::string::const_iterator start, end;
+      start = CMfile.begin();
+      end = CMfile.end();
+      boost::match_results<std::string::const_iterator> what;
+      boost::match_flag_type flags = boost::match_default;
+      if(boost::regex_search(start, end, what, expression, flags))
         {
-          // if the element is a command and is a SET command
-          if (cmlFile[i].first == "command" && cmlFile[i].second[0] == "SET")
+
+          expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES");
+          std::string::const_iterator start1, end1;
+          start1 = what[0].first;
+          end1 = what[0].second;
+          boost::match_results<std::string::const_iterator> what1;
+          if(boost::regex_search(start1, end1, what1, expression, flags))
             {
-              // search first parameter
-              int pos = 1;
-              while (pos < cmlFile[i].second.size())
+              expression = boost::regex("(#[^\\n]*\\n|\\s*\\$\\{\\w+\\})");
+              std::string::const_iterator start2, end2;
+              start2 = what1[0].second;
+              end2 = what[0].second;
+              boost::match_results<std::string::const_iterator> what2;
+              while(boost::regex_search(start2, end2, what2, expression, flags))
                 {
-                  // see if it is ${LIBRARY_NAME}_LINK_LIBRARIES
-                  if (cmlFile[i].second[pos] == "${EXE_NAME}_LINK_LIBRARIES")
-                    {
-                      pos++;
-                      // look for all the third party libraries included
-                      while (pos < cmlFile[i].second.size())
-                        {
-                          if (cmlFile[i].second[pos][0] == '$' && correspondence.find(cmlFile[i].second[pos]) != correspondence.end())
-                            {
-                              res[correspondence[cmlFile[i].second[pos]]] = true;
-                            }
-                          pos++;
-                        }
-                    }
-                  // if it is the first parameter but is not ${LIBRARY_NAME}_LINK_LIBRARIES then finish with this command
-                  else if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')')
+                  if(what2.str()[0] != '#')
                     {
-                      break;
+                      std::string dete = what2.str();
+                      CDMUtilities::normalizeStr(dete);
+                      if(correspondence.find(dete) != correspondence.end())
+                        res[correspondence[dete]] = true;
                     }
-                  pos++;
+                  start2 = what2[0].second;
                 }
             }
         }