Sfoglia il codice sorgente

ERR: Changed generation of rule to generate cable_config.xml to be produced differently for windows and unix.

Brad King 25 anni fa
parent
commit
28cdb19782
1 ha cambiato i file con 12 aggiunte e 6 eliminazioni
  1. 12 6
      Source/cmCableCommand.cxx

+ 12 - 6
Source/cmCableCommand.cxx

@@ -84,12 +84,18 @@ void cmCableCommand::SetupCableData()
   std::string cMakeLists = m_Makefile->GetStartDirectory();
   cMakeLists += "/";
   cMakeLists += "CMakeLists.txt";
-  std::string command = m_Makefile->GetHomeOutputDirectory();  
-  command += "/CMake/Source/";
-  command += cmSystemTools::GetCMakeExecutableName();
-  command += " " + cMakeLists;
-  command += " ";
-  command += cmSystemTools::GetCMakeExecutableOptions();
+
+  std::string command;
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  command = m_Makefile->GetHomeDirectory();  
+  command += "/CMake/Source/CMakeSetupCMD ";
+  command += cMakeLists;
+  command += " -DSP";
+#else
+  command = m_Makefile->GetHomeOutputDirectory();  
+  command += "/CMake/Source/CMakeBuildTargets ";
+  command += cMakeLists;
+#endif
   command += " -H";
   command += m_Makefile->GetHomeDirectory();
   command += " -S";