X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FcreaNewProject%2FcreaNewProject.cpp;h=f66f2a54006d6c6e867fd9558f4ddd112a3d73ea;hb=refs%2Ftags%2FEED.02Oct2009;hp=c2c9065ebfec3666eb61cc4ccf5873ed7af44c79;hpb=16fa26d7830175d0d6f952982128c2d63b724f78;p=crea.git

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index c2c9065..f66f2a5 100644
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -30,19 +30,30 @@ bool myApp::OnInit( )
    
 #if(_WIN32)
    std::string command("creaNewProject.bat ");
+    std::string command1("creaSed.exe ");
+	std::string command2("del ");
 #else
    std::string command("creaNewProject.sh ");
 #endif
-   command += crea::wx2std(dir) + " " + crea::wx2std(name);
+<<<<<<< creaNewProject.cpp
+   command += "\"" + crea::wx2std(dir) + "\"" +" " + crea::wx2std(name);
+=======
+   command += "\"" + crea::wx2std(dir) + "\" \"" + crea::wx2std(name) + "\"";
+   command1 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\" " + "PROJECT_NAME " + crea::wx2std(name) + "> \"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt\"";
+   command2 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\"";
+>>>>>>> 1.3
 
    if ( ! system ( command.c_str() ) )
      {
+		 
+		 system ( command1.c_str() );
+		 system ( command2.c_str() );
        wxMessageBox(_T("Done !"),_T("creaNewProject"),
 		    wxOK | wxICON_INFORMATION);
      }
    else 
      {
-       wxString err("An error occured while running '");
+       wxString err(_T("An error occured while running '"));
        err +=  crea::std2wx(command) + _T("'");
        wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);      
      }