X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMApplication.cpp;h=1a9c3ad4c8c1f84e3d9658397948c4d912d072a6;hb=71c071fbb1e2af618f6caa489351b966e1a54b1a;hp=40fb8105b12dbb270f7e2704eb9cd5e7f95a7622;hpb=72a6140565ccd0905f822c7bf17ea471762a9301;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp
index 40fb810..1a9c3ad 100644
--- a/lib/creaDevManagerLib/modelCDMApplication.cpp
+++ b/lib/creaDevManagerLib/modelCDMApplication.cpp
@@ -140,7 +140,7 @@ modelCDMApplication::modelCDMApplication(modelCDMIProjectTreeNode* parent, const
                       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")
+                      if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
                         {
                           this->mainFile = file;
                         }
@@ -206,7 +206,12 @@ bool modelCDMApplication::SetExecutableName(const std::string& fileName, std::st
   in.close();
   out.close();
   //delete old file and rename new file
+#ifdef _WIN32
+  std::string renameCommand = "move /Y \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#else
   std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#endif
+  
   if(system(renameCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + renameCommand + "'.");
@@ -358,7 +363,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
                               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")
+                              if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
                                 {
                                   this->mainFile = dynamic_cast<modelCDMFile*>(children[i]);
                                 }
@@ -384,7 +389,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
                           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")
+                          if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
                             {
                               this->mainFile = file;
                             }
@@ -509,3 +514,27 @@ void modelCDMApplication::CheckStructure(std::map<std::string, bool>& properties
 
     }
 }
+
+std::map<std::string, bool> modelCDMApplication::Get3rdPartyLibraries()
+{
+  std::map<std::string, bool> res;
+  res["Test"] = false;
+  return res;
+}
+
+bool modelCDMApplication::Set3rdPartyLibrary(const std::string& library_name, const bool& toInclude)
+{
+  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;
+}