Feature #1711

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

diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp
index 40fb8105b12dbb270f7e2704eb9cd5e7f95a7622..7083c4738cb9e778fc26d04cf9bb14d9f4b676d7 100644 (file)
--- 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;
                             }