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

diff --git a/lib/creaDevManagerLib/modelCDMPackage.cpp b/lib/creaDevManagerLib/modelCDMPackage.cpp
index c6ea443..147953b 100644
--- a/lib/creaDevManagerLib/modelCDMPackage.cpp
+++ b/lib/creaDevManagerLib/modelCDMPackage.cpp
@@ -37,6 +37,7 @@
 #include <fstream>
 #include <sstream>
 #include <algorithm>
+#include <boost/regex.hpp>
 
 #include "creaWx.h"
 #include "wx/dir.h"
@@ -711,44 +712,31 @@ std::map<std::string, bool> modelCDMPackage::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)*\\$\\{BBTK_PACKAGE_NAME\\}_USE_\\w+\\s+ON");
+      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;
+      while(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")
+          std::cout << what[0].str() << std::endl;
+          boost::regex expression1 = boost::regex("\\$\\{BBTK_PACKAGE_NAME\\}_USE_\\w+");
+          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, expression1, flags))
             {
-              // search first parameter
-              int pos = 1;
-              while (pos < cmlFile[i].second.size())
-                {
-                  if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')')
-                    {
-                      break;
-                    }
-                  pos++;
-                }
-              // if the first parameter is a third party statement
-              if (pos < cmlFile[i].second.size() && correspondence.find(cmlFile[i].second[pos]) != correspondence.end())
-                {
-                  std::string foundLibrary = cmlFile[i].second[pos];
-                  // search for second parameter
-                  pos++;
-                  while (pos < cmlFile[i].second.size())
-                    {
-                      if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')')
-                        {
-                          break;
-                        }
-                      pos++;
-                    }
-                  // if the second parameter is ON
-                  if (pos < cmlFile[i].second.size() && cmlFile[i].second[pos] == "ON")
-                    {
-                      res[correspondence[foundLibrary]] = true;
-                    }
-                }
+              std::string dete = what1.str();
+              CDMUtilities::normalizeStr(dete);
+              std::cout << dete << std::endl;
+              if(correspondence.find(dete) != correspondence.end())
+                res[correspondence[dete]] = true;
             }
+          start = what[0].second;
         }
     }
   return res;