kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: More fixes for non makefile generators and global targets

Browse Source
This commit is contained in:
Andy Cedilnik 2006-02-24 18:15:35 -05:00
parent 1cd8c64384
commit 3d9610feec
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalGenerator.cxx
View File

@ -1248,11 +1248,13 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
cpackCommandLines.erase(cpackCommandLines.begin(), cpackCommandLines.end()); cpackCommandLines.erase(cpackCommandLines.begin(), cpackCommandLines.end());
singleLine.erase(singleLine.begin(), singleLine.end()); singleLine.erase(singleLine.begin(), singleLine.end());
depends.erase(depends.begin(), depends.end()); depends.erase(depends.begin(), depends.end());
const char* cmakeCommand = this->GetCMakeInstance()->GetCMakeCommand();
// Use CMAKE_EDIT_COMMAND for the edit_cache rule if it is defined. // Use CMAKE_EDIT_COMMAND for the edit_cache rule if it is defined.
// Otherwise default to the interactive command-line interface. // Otherwise default to the interactive command-line interface.
if(mf->GetDefinition("CMAKE_EDIT_COMMAND")) if(mf->GetDefinition("CMAKE_EDIT_COMMAND"))
{ {
singleLine.push_back("$(CMAKE_EDIT_COMMAND)"); singleLine.push_back(mf->GetDefinition("CMAKE_EDIT_COMMAND"));
singleLine.push_back("-H$(CMAKE_SOURCE_DIR)"); singleLine.push_back("-H$(CMAKE_SOURCE_DIR)");
singleLine.push_back("-B$(CMAKE_BINARY_DIR)"); singleLine.push_back("-B$(CMAKE_BINARY_DIR)");
cpackCommandLines.push_back(singleLine); cpackCommandLines.push_back(singleLine);
@ -1263,7 +1265,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
} }
else else
{ {
singleLine.push_back("$(CMAKE_COMMAND)"); singleLine.push_back(cmakeCommand);
singleLine.push_back("-H$(CMAKE_SOURCE_DIR)"); singleLine.push_back("-H$(CMAKE_SOURCE_DIR)");
singleLine.push_back("-B$(CMAKE_BINARY_DIR)"); singleLine.push_back("-B$(CMAKE_BINARY_DIR)");
singleLine.push_back("-i"); singleLine.push_back("-i");
@ -1278,7 +1280,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
cpackCommandLines.erase(cpackCommandLines.begin(), cpackCommandLines.end()); cpackCommandLines.erase(cpackCommandLines.begin(), cpackCommandLines.end());
singleLine.erase(singleLine.begin(), singleLine.end()); singleLine.erase(singleLine.begin(), singleLine.end());
depends.erase(depends.begin(), depends.end()); depends.erase(depends.begin(), depends.end());
singleLine.push_back("$(CMAKE_COMMAND)"); singleLine.push_back(cmakeCommand);
singleLine.push_back("-H$(CMAKE_SOURCE_DIR)"); singleLine.push_back("-H$(CMAKE_SOURCE_DIR)");
singleLine.push_back("-B$(CMAKE_BINARY_DIR)"); singleLine.push_back("-B$(CMAKE_BINARY_DIR)");
cpackCommandLines.push_back(singleLine); cpackCommandLines.push_back(singleLine);
@ -1301,12 +1303,11 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
// We are building CMake itself. We cannot use the original // We are building CMake itself. We cannot use the original
// executable to install over itself. // executable to install over itself.
cmd = mf->GetDefinition("EXECUTABLE_OUTPUT_PATH"); cmd = mf->GetDefinition("EXECUTABLE_OUTPUT_PATH");
cmd += "/"; cmd += "/cmake";
cmd += "cmake";
} }
else else
{ {
cmd = "$(CMAKE_COMMAND)"; cmd = cmakeCommand;
} }
singleLine.push_back(cmd.c_str()); singleLine.push_back(cmd.c_str());
const char* cmakeCfgIntDir = this->GetCMakeCFGInitDirectory(); const char* cmakeCfgIntDir = this->GetCMakeCFGInitDirectory();

1
Source/cmake.h
View File

@ -273,6 +273,7 @@ class cmake
*/ */
const char* GetCTestCommand(); const char* GetCTestCommand();
const char* GetCPackCommand(); const char* GetCPackCommand();
const char* GetCMakeCommand() { return m_CMakeCommand.c_str(); }
protected: protected:
typedef cmGlobalGenerator* (*CreateGeneratorFunctionType)(); typedef cmGlobalGenerator* (*CreateGeneratorFunctionType)();