BUG: Fixed output of CMakeLists.txt path in cable_config.xml dependency list for unix. Needed to escape spaces instead of enclosing in double quotes.
This commit is contained in:
parent
73644c3acd
commit
e7519358e7
@ -73,19 +73,20 @@ bool cmCablePackageCommand::Invoke(std::vector<std::string>& args)
|
|||||||
{
|
{
|
||||||
// We must add a custom rule to cause the cable_config.xml to be re-built
|
// We must add a custom rule to cause the cable_config.xml to be re-built
|
||||||
// when it is removed. Rebuilding it means re-running CMake.
|
// when it is removed. Rebuilding it means re-running CMake.
|
||||||
std::string cMakeLists = "\"";
|
std::string cMakeLists = m_Makefile->GetStartDirectory();
|
||||||
cMakeLists += m_Makefile->GetStartDirectory();
|
|
||||||
cMakeLists += "/";
|
cMakeLists += "/";
|
||||||
cMakeLists += "CMakeLists.txt\"";
|
cMakeLists += "CMakeLists.txt";
|
||||||
|
|
||||||
std::string command;
|
std::string command;
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
#if defined(_WIN32) && !defined(__CYGWIN__)
|
||||||
|
cMakeLists = "\""+cMakeLists+"\"";
|
||||||
command = "\"";
|
command = "\"";
|
||||||
command += m_Makefile->GetHomeDirectory();
|
command += m_Makefile->GetHomeDirectory();
|
||||||
command += "/CMake/Source/CMakeSetupCMD\" \"";
|
command += "/CMake/Source/CMakeSetupCMD\" \"";
|
||||||
command += cMakeLists;
|
command += cMakeLists;
|
||||||
command += "\" -DSP";
|
command += "\" -DSP";
|
||||||
#else
|
#else
|
||||||
|
cMakeLists = cmSystemTools::EscapeSpaces(cMakeLists.c_str());
|
||||||
command = "\"";
|
command = "\"";
|
||||||
command += m_Makefile->GetHomeOutputDirectory();
|
command += m_Makefile->GetHomeOutputDirectory();
|
||||||
command += "/CMake/Source/CMakeBuildTargets\" \"";
|
command += "/CMake/Source/CMakeBuildTargets\" \"";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user