]> Creatis software - crea.git/blobdiff - lib/creaDevManagerLib/modelCDMApplication.cpp
Feature #1711 CreaDevManager application implementation
[crea.git] / lib / creaDevManagerLib / modelCDMApplication.cpp
index c0d3b4620195ea526fef79d41b3960a7d321e898..cabfd7c7a259326bbf0f3eb6a991cdf4d4bc3d21 100644 (file)
 
 #include "modelCDMApplication.h"
 
+#include "modelCDMProject.h"
+#include "modelCDMLib.h"
+#include "modelCDMLibrary.h"
+
 #include <fstream>
 #include <sstream>
 #include <algorithm>
@@ -118,59 +122,80 @@ modelCDMApplication::modelCDMApplication(modelCDMIProjectTreeNode* parent, const
       while (cont)
         {
           std::string stdfileName = crea::wx2std(fileName);
+          std::size_t fileTypePos = stdfileName.find_last_of(".");
+          std::string fileType;
+          if(fileTypePos != std::string::npos)
+            fileType = stdfileName.substr(fileTypePos);
+          else
+            fileType = "";
+
           //if CMakeLists, create CMakeLists
           if(stdfileName == "CMakeLists.txt")
             {
               this->CMakeLists = new modelCDMCMakeListsFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
               this->children.push_back(this->CMakeLists);
             }
-          //if is an unknown file, create file
           else
             {
-              modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
-              std::string extension = stdfileName.substr(stdfileName.size()-4);
-              //if is cxx or cpp check if is the main file.
-              if (mainFile == NULL && (extension == ".cxx" || extension == ".cpp"))
+              //if is a code file, create modelCDMCodeFile and check for main file
+              if(
+                fileType == ".c" ||
+                fileType == ".cxx" ||
+                fileType == ".h" ||
+                fileType == ".cpp" ||
+                fileType == ".txx" ||
+                fileType == ".cmake" )
                 {
-                  std::ifstream fileStream((this->path + CDMUtilities::SLASH + stdfileName).c_str());
+                  modelCDMCodeFile* file = new modelCDMCodeFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
 
-                  if (fileStream.is_open())
+                  if (mainFile == NULL && (fileType == ".cxx" || fileType == ".cpp"))
                     {
-                      std::string fileContent = "";
-                      char ch = fileStream.get();
-                      while(!fileStream.eof())
-                        {
-                          fileContent.push_back(ch);
-                          ch = fileStream.get();
-                        }
-                      fileStream.close();
-
-                      boost::regex expression("^\\h*IMPLEMENT_APP[#\\s\\(]");
-                      std::string::const_iterator start, end;
-                      start = fileContent.begin();
-                      end = fileContent.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))
-                        {
-                          std::cout << "found main wxwidgets file: " << stdfileName << std::endl;
-                          this->mainFile = file;
-                        }
-                      else
+                      std::ifstream fileStream((this->path + CDMUtilities::SLASH + stdfileName).c_str());
+
+                      if (fileStream.is_open())
                         {
-                          expression = boost::regex("^\\h*int\\h+main[#\\s\\(]");
+                          std::string fileContent = "";
+                          char ch = fileStream.get();
+                          while(!fileStream.eof())
+                            {
+                              fileContent.push_back(ch);
+                              ch = fileStream.get();
+                            }
+                          fileStream.close();
+
+                          boost::regex expression("^\\h*IMPLEMENT_APP[#\\s\\(]");
+                          std::string::const_iterator start, end;
                           start = fileContent.begin();
                           end = fileContent.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))
                             {
-                              std::cout << "found main console file: " << stdfileName << std::endl;
+                              std::cout << "found main wxwidgets file: " << stdfileName << std::endl;
                               this->mainFile = file;
                             }
+                          else
+                            {
+                              expression = boost::regex("^\\h*int\\h+main[#\\s\\(]");
+                              start = fileContent.begin();
+                              end = fileContent.end();
+                              if(boost::regex_search(start, end, what, expression, flags))
+                                {
+                                  std::cout << "found main console file: " << stdfileName << std::endl;
+                                  this->mainFile = file;
+                                }
+                            }
                         }
                     }
-
+                  this->children.push_back(file);
                 }
-              this->children.push_back(file);
+              //if is an unknown file, create file
+              else
+                {
+                  modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+                  this->children.push_back(file);
+                }
+
             }
 
           cont = dir.GetNext(&fileName);
@@ -343,6 +368,12 @@ const bool modelCDMApplication::Refresh(std::string*& result)
       while (cont)
         {
           std::string stdfileName = crea::wx2std(fileName);
+          std::size_t fileTypePos = stdfileName.find_last_of(".");
+          std::string fileType;
+          if(fileTypePos != std::string::npos)
+            fileType = stdfileName.substr(fileTypePos);
+          else
+            fileType = "";
 
           //if CMakeLists, create CMakeLists
           if(stdfileName == "CMakeLists.txt")
@@ -360,7 +391,8 @@ const bool modelCDMApplication::Refresh(std::string*& result)
                     return false;
                 }
             }
-          //if is an unknown file, create file
+          // if is a code file, create modelCDMCodeFile
+          // if is an unknown file, create file
           else
             {
               bool found = false;
@@ -388,7 +420,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
                               CDMUtilities::splitter::split(wordBits,word," \n",CDMUtilities::splitter::no_empties);
                               if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
                                 {
-                                  this->mainFile = dynamic_cast<modelCDMFile*>(children[i]);
+                                  this->mainFile = dynamic_cast<modelCDMCodeFile*>(children[i]);
                                 }
                             }
                           fileStream.close();
@@ -398,29 +430,40 @@ const bool modelCDMApplication::Refresh(std::string*& result)
 
               if(!found)
                 {
-                  modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
-
-                  std::string extension = stdfileName.substr(stdfileName.size()-4);
-                  if (mainFile == NULL && (extension == ".cxx" || extension == ".cpp"))
+                  if (fileType == ".c" ||
+                    fileType == ".cxx" ||
+                    fileType == ".h" ||
+                    fileType == ".cpp" ||
+                    fileType == ".txx" ||
+                    fileType == ".cmake" )
                     {
-                      std::ifstream fileStream;
-                      std::string word;
-                      fileStream.open((this->path + CDMUtilities::SLASH + stdfileName).c_str());
-                      while (fileStream.is_open() && !fileStream.eof())
+                      modelCDMCodeFile* file = new modelCDMCodeFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+
+                      if(mainFile == NULL && (fileType == ".cxx" || fileType == ".cpp"))
                         {
-                          //get sets
-                          std::getline(fileStream,word,'(');
-                          std::vector<std::string> wordBits;
-                          CDMUtilities::splitter::split(wordBits,word," \n",CDMUtilities::splitter::no_empties);
-                          if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
+                          std::ifstream fileStream;
+                          std::string word;
+                          fileStream.open((this->path + CDMUtilities::SLASH + stdfileName).c_str());
+                          while (fileStream.is_open() && !fileStream.eof())
                             {
-                              this->mainFile = file;
+                              //get sets
+                              std::getline(fileStream,word,'(');
+                              std::vector<std::string> wordBits;
+                              CDMUtilities::splitter::split(wordBits,word," \n",CDMUtilities::splitter::no_empties);
+                              if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
+                                {
+                                  this->mainFile = file;
+                                }
                             }
+                          fileStream.close();
                         }
-                      fileStream.close();
+                      this->children.push_back(file);
+                    }
+                  else
+                    {
+                      modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+                      this->children.push_back(file);
                     }
-
-                  this->children.push_back(file);
                 }
             }
 
@@ -612,105 +655,381 @@ bool modelCDMApplication::Set3rdPartyLibrary(const std::string& library_name, co
   correspondence["GDCM"] = "${GDCM_LIBRARIES}";
   correspondence["Boost"] = "${BOOST_LIBRARIES}";
 
+  std::map<std::string, std::string> regexCorrespondence;
+
+  regexCorrespondence["Crea"] = "\\$\\{crea_LIBRARIES\\}";
+  regexCorrespondence["WxWidgets"] = "\\$\\{WXWIDGETS_LIBRARIES\\}";
+  regexCorrespondence["KWWidgets"] = "\\$\\{KWWidgets_LIBRARIES\\}";
+  regexCorrespondence["VTK"] = "\\$\\{VTK_LIBRARIES\\}";
+  regexCorrespondence["ITK"] = "\\$\\{ITK_LIBRARIES\\}";
+  regexCorrespondence["GDCM"] = "\\$\\{GDCM_LIBRARIES\\}";
+  regexCorrespondence["Boost"] = "\\$\\{BOOST_LIBRARIES\\}";
+
   if (correspondence.find(library_name) != correspondence.end())
     {
       std::string library_command = correspondence[library_name];
+      std::string regex_command = regexCorrespondence[library_name];
+      if (this->HasCMakeLists())
+        {
+          std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str());
+          std::string resCMfile = "";
+
+          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))
+            {
+              resCMfile += what.prefix().str();
+              bool found = false;
+              if (toInclude) {
+                expression = "^\\h*#+\\h*" + regex_command;
+                std::string::const_iterator start1, end1;
+                start1 = what[0].first;
+                end1 = what[0].second;
+                boost::match_results<std::string::const_iterator> what1, what2;
+                while(boost::regex_search(start1, end1, what1, expression, flags))
+                  {
+                    found = true;
+                    resCMfile += what1.prefix().str();
+                    std::string dete = what1[0].str();
+                    for (int i = 0; i < dete.size(); ++i) {
+                      if (dete[i] != '#')
+                        resCMfile.push_back(dete[i]);
+                    }
+                    what2 = what1;
+                    start1 = what1[0].second;
+                  }
+                if (found)
+                  resCMfile += what2.suffix().str();
+                else
+                  {
+                    expression = "^\\h*" + regex_command;
+                    if(boost::regex_search(start1, end1, what1, expression, flags))
+                      found = true;
+
+                    expression = "^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES";
+                    boost::regex_search(start1, end1, what1, expression, flags);
+
+                    resCMfile += what1.prefix().str() + what1.str();
+                    if(!found)
+                      resCMfile += "\n" + library_command + "\n";
+                    resCMfile += what1.suffix().str();
+                  }
+
+              }else{
+                expression = "^\\h*" + regex_command;
+                std::string::const_iterator start1, end1;
+                start1 = what[0].first;
+                end1 = what[0].second;
+                boost::match_results<std::string::const_iterator> what1, what2;
+                while(boost::regex_search(start1, end1, what1, expression, flags))
+                  {
+                    found = true;
+                    resCMfile += what1.prefix().str();
+                    resCMfile += "#" + what1.str();
+                    what2 = what1;
+                    start1 = what1[0].second;
+                  }
+                if (found)
+                  resCMfile += what2.suffix().str();
+                else
+                  {
+                    expression = "^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES";
+                    boost::regex_search(start1, end1, what1, expression, flags);
+
+                    resCMfile += what1.prefix().str() + what1.str() + what1.suffix().str();
+                  }
+              }
+              resCMfile += what.suffix().str();
+
+              return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile);
+            }
+        }
+    }
+  return false;
+
+}
+
+std::map<std::string, bool> modelCDMApplication::GetCustomLibraries()
+{
+  std::map<std::string, bool> res;
+  std::map<std::string, bool> res1;
+
+  std::map<std::string, std::string> correspondence;
+  std::vector<modelCDMLibrary*> libraries;
+  if(this->GetParent() != NULL && this->GetParent()->GetParent() != NULL)
+    if(dynamic_cast<modelCDMProject*>(this->GetParent()->GetParent()) != NULL && dynamic_cast<modelCDMProject*>(this->GetParent()->GetParent())->GetLib() != NULL)
+      libraries = (dynamic_cast<modelCDMProject*>(this->GetParent()->GetParent()))->GetLib()->GetLibraries();
+  for (int i = 0; i < libraries.size(); ++i)
+    {
+      correspondence[libraries[i]->GetName()] = libraries[i]->GetNameLibrary();
+      res[libraries[i]->GetNameLibrary()] = false;
+      res1[libraries[i]->GetNameLibrary()] = false;
+    }
+
+  if (this->HasCMakeLists())
+    {
+      std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str());
+
+      //find included libraries
+      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))
+        {
+
+          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))
+            {
+              expression = boost::regex("^\\h*[\\w\\d]+");
+              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))
+                {
+                  std::string dete = what2.str();
+                  CDMUtilities::normalizeStr(dete);
+                  //std::cout << "detectado lib: " << dete << std::endl;
+                  if(res1.find(dete) != res1.end())
+                    res1[dete] = true;
+
+                  start2 = what2[0].second;
+                }
+            }
+        }
+
+      //find included folders
+      //std::cout << "searching..." << std::endl;
+      expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*([\\./\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\")(([\\s]|#[^\\n]*\\n)+([\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)");
+      start = CMfile.begin();
+      end = CMfile.end();
+      if(boost::regex_search(start, end, what, expression, flags))
+        {
+          //std::cout << what.str() << std::endl;
+          expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\(");
+          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))
+            {
+              //std::cout << what1.str() << std::endl;
+              expression = boost::regex("^\\h*\\.\\.\\/\\.\\.\\/lib\\/([\\w\\d])+");
+              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))
+                {
+                  std::string dete = what2.str();
+                  CDMUtilities::normalizeStr(dete);
+                  //std::cout << "detectado dir: " << dete.substr(10) << std::endl;
+                  if(correspondence.find(dete.substr(10)) != correspondence.end())
+                    res[correspondence[dete.substr(10)]] = res1[correspondence[dete.substr(10)]];
+
+                  start2 = what2[0].second;
+                }
+            }
+        }
+    }
+
+  return res;
+}
+
+bool modelCDMApplication::SetCustomLibrary(const std::string& library_name, const bool& toInclude)
+{
+  std::map<std::string, std::string> correspondence;
+
+  std::vector<modelCDMLibrary*> libraries;
+  modelCDMIProjectTreeNode* p = this;
+  while(p != NULL && dynamic_cast<modelCDMProject*>(p) == NULL)
+    p = p->GetParent();
+
+  if(p != NULL && dynamic_cast<modelCDMProject*>(p)->GetLib() != NULL)
+    libraries = dynamic_cast<modelCDMProject*>(p)->GetLib()->GetLibraries();
+
+  for (int i = 0; i < libraries.size(); ++i)
+    {
+      correspondence[libraries[i]->GetNameLibrary()] = libraries[i]->GetName();
+    }
+
+  if (correspondence.find(library_name) != correspondence.end())
+    {
       if (this->HasCMakeLists())
         {
-          CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath());
+          std::string resCMfile = "";
+          std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str());
+          bool found = false;
 
-          // look at every syntax element
-          for (int i = 0; i < cmlFile.size(); ++i)
+          //find included libraries
+          //std::cout << "searching..." << CMfile << std::endl;
+          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")
+              //std::cout << what.str() << std::endl;
+              resCMfile += what.prefix().str();
+              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())
+                  resCMfile += what1.prefix().str() + what1.str();
+                  //check if already exists
+                  expression = boost::regex("^\\h*"+library_name);
+                  std::string::const_iterator start2, end2;
+                  start2 = what1[0].second;
+                  end2 = what[0].second;
+                  boost::match_results<std::string::const_iterator> what2, temp2;
+                  while(boost::regex_search(start2, end2, what2, expression, flags))
+                    {
+                      resCMfile += what2.prefix().str();
+                      found = true;
+                      if (!toInclude)
+                        {
+                          resCMfile += "#";
+                        }
+                      resCMfile += what2.str();
+                      temp2 = what2;
+                      start2 = what2[0].second;
+                    }
+                  if(found)
+                    resCMfile += temp2.suffix().str();
+                  //check if is commented
+                  else
                     {
-                      // see if it is ${LIBRARY_NAME}_LINK_LIBRARIES
-                      if (cmlFile[i].second[pos] == "${EXE_NAME}_LINK_LIBRARIES")
+                      expression = boost::regex("^\\h*#+\\h*"+library_name);
+                      start2 = what1[0].second;
+                      end2 = what[0].second;
+                      while(boost::regex_search(start2, end2, what2, expression, flags))
                         {
-                          bool found = false;
-                          pos++;
-                          // look for all the third party libraries included
-                          while (pos < cmlFile[i].second.size() && cmlFile[i].second[pos] != ")")
+                          found = true;
+                          resCMfile += what2.prefix().str();
+                          if(toInclude)
                             {
-                              // if is library_command then found
-                              if (cmlFile[i].second[pos] == library_command)
-                                {
-                                  found = true;
-                                  //if toInclude is false the make it a comment
-                                  if (!toInclude)
-                                    {
-                                      cmlFile[i].second[pos] = "#" + cmlFile[i].second[pos];
-                                      std::cout << "library commented: " << library_name << std::endl;
-                                    }
-                                  break;
-                                }
-                              else if (toInclude && cmlFile[i].second[pos][0] == '#')
-                                {
-                                  std::vector<std::string> segments;
-                                  CDMUtilities::splitter::split(segments, cmlFile[i].second[pos], "#", CDMUtilities::splitter::no_empties);
-                                  if(segments.size())
-                                    {
-                                      for (int j = 0; j < segments[0].size(); ++j)
-                                        {
-                                          if(isspace(segments[0][j]))
-                                            {
-                                              segments[0].erase(j,1);
-                                              j--;
-                                            }
-                                        }
-
-                                      if(segments[0].size() && segments[0] == library_command)
-                                        {
-                                          found = true;
-                                          while(cmlFile[i].second[pos][0] == '#')
-                                            {
-                                              cmlFile[i].second[pos].erase(0,1);
-                                            }
-                                          std::cout << "library uncommented: " << library_name << std::endl;
-                                          break;
-                                        }
-                                    }
-                                }
-                              pos++;
+                              std::string dete = what2[0].str();
+                              for (int i = 0; i < dete.size(); ++i) {
+                                if (dete[i] != '#')
+                                  resCMfile.push_back(dete[i]);
+                              }
                             }
+                          temp2 = what2;
+                          start2 = what2[0].second;
+                        }
+                      if(found)
+                        resCMfile += temp2.suffix().str();
+                      //add at the beggining of instruction
+                      else
+                        {
+                          if(toInclude)
+                            resCMfile += "\n" + library_name;
+                          resCMfile += what1.suffix().str();
+                        }
+                    }
+                }
+              resCMfile += what.suffix().str();
+            }
+          else
+            return false;
+
+          //find included folders
+          CMfile = resCMfile;
+          resCMfile = "";
+
 
-                          //if the library was not found and is an inclusion then include it
-                          if (!found && toInclude && pos < cmlFile[i].second.size() && cmlFile[i].second[pos] == ")")
+          found = false;
+          //std::cout << "searching..." << CMfile << std::endl;
+          expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*([\\.\\/\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"){0,1}?(([\\s]|#[^\\n]*\\n)+([\\.\\/\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)");
+          start = CMfile.begin();
+          end = CMfile.end();
+          if(boost::regex_search(start, end, what, expression, flags))
+            {
+              resCMfile += what.prefix().str();
+              //std::cout << what.str() << std::endl;
+              expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\(");
+              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))
+                {
+                  resCMfile += what1.prefix().str() + what1.str();
+                  //std::cout << what1.str() << std::endl;
+                  //search if dir is already included
+                  expression = boost::regex("^\\h*\\.\\.\\/\\.\\.\\/lib\\/"+correspondence[library_name]);
+                  std::string::const_iterator start2, end2;
+                  start2 = what1[0].second;
+                  end2 = what[0].second;
+                  boost::match_results<std::string::const_iterator> what2, temp2;
+                  while(boost::regex_search(start2, end2, what2, expression, flags))
+                    {
+                      found = true;
+                      resCMfile += what2.prefix().str();
+                      if(!toInclude)
+                        resCMfile += "#";
+                      resCMfile += what2.str();
+                      temp2 = what2;
+                      start2 = what2[0].second;
+                    }
+                  if(found)
+                    resCMfile += temp2.suffix().str();
+                  //search if dir is commented
+                  else
+                    {
+                      expression = boost::regex("^\\h*#+\\h*\\.\\.\\/\\.\\.\\/lib\\/"+correspondence[library_name]);
+                      start2 = what1[0].second;
+                      end2 = what[0].second;
+                      while(boost::regex_search(start2, end2, what2, expression, flags))
+                        {
+                          found = true;
+                          resCMfile += what2.prefix().str();
+                          if(toInclude)
                             {
-                              cmlFile[i].second.insert(cmlFile[i].second.begin()+pos, library_command);
-                              cmlFile[i].second.insert(cmlFile[i].second.begin()+pos+1, "\n");
-                              std::cout << "library included: " << library_name << std::endl;
+                              std::string dete = what2[0].str();
+                              for (int i = 0; i < dete.size(); ++i) {
+                                if (dete[i] != '#')
+                                  resCMfile.push_back(dete[i]);
+                              }
                             }
+                          temp2 = what2;
+                          start2 = what2[0].second;
                         }
-                      // 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(found)
+                        resCMfile += temp2.suffix().str();
+                      //add at the beggining of instruction
+                      else
                         {
-                          break;
+                          if(toInclude)
+                            resCMfile += "\n../../lib/" + correspondence[library_name];
+                          resCMfile += what1.suffix().str();
                         }
-                      pos++;
                     }
                 }
+              resCMfile += what.suffix().str();
             }
+          else
+            return false;
 
-          return CDMUtilities::writeCMLFile(this->CMakeLists->GetPath(), cmlFile);
+          return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile);
         }
     }
-  return false;
-}
 
-std::map<std::string, bool> modelCDMApplication::GetCustomLibraries()
-{
-  std::map<std::string, bool> res;
-  res["Test"] = false;
-  return res;
-}
-
-bool modelCDMApplication::SetCustomLibrary(const std::string& library_name, const bool& toInclude)
-{
   return false;
 }