diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-25 17:38:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-25 17:38:53 (GMT) |
| commit | a2d65c66b1c89f26849b805da340059589d7a87d (patch) | |
| tree | 84ba9f660512efb287e58e07f12a346e9c505db2 /Source | |
| parent | 3ec3b8a926a921113d6232e3b9aaf20acfd746fb (diff) | |
| parent | 6650b0fa43ef55e8bad9188c584f40d515f38bd6 (diff) | |
| download | CMake-a2d65c66b1c89f26849b805da340059589d7a87d.zip CMake-a2d65c66b1c89f26849b805da340059589d7a87d.tar.gz CMake-a2d65c66b1c89f26849b805da340059589d7a87d.tar.bz2 | |
Merge branch 'bootstrap-cmake-locations' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSystemTools.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index c7acfd0..575b973 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2163,6 +2163,11 @@ void cmSystemTools::FindCMakeResources(const char* argv0) cmSystemToolsCMakeCommand = exe_dir; cmSystemToolsCMakeCommand += "/cmake"; cmSystemToolsCMakeCommand += cmSystemTools::GetExecutableExtension(); +#ifndef CMAKE_BUILD_WITH_CMAKE + // The bootstrap cmake does not provide the other tools, + // so use the directory where they are about to be built. + exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin"; +#endif cmSystemToolsCTestCommand = exe_dir; cmSystemToolsCTestCommand += "/ctest"; cmSystemToolsCTestCommand += cmSystemTools::GetExecutableExtension(); @@ -2215,7 +2220,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0) } #else // Bootstrap build knows its source. - cmSystemToolsCMakeRoot = CMAKE_ROOT_DIR; + cmSystemToolsCMakeRoot = CMAKE_BOOTSTRAP_SOURCE_DIR; #endif } |