mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-11 09:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmSystemTools: Invert condition to make non-bootstrap logic easier to follow

Browse Source
This commit is contained in:
Brad King
2024-11-11 11:53:00 -05:00
parent 46ac308249
commit 0925abb09b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmSystemTools.cxx
View File

@@ -2798,7 +2798,14 @@ void FindCMakeResourcesInBuildTree(std::string const& exe_dir)
void cmSystemTools::FindCMakeResources(const char* argv0) void cmSystemTools::FindCMakeResources(const char* argv0)
{ {
std::string exe = FindOwnExecutable(argv0); std::string exe = FindOwnExecutable(argv0);
#ifndef CMAKE_BOOTSTRAP #ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake knows its resource locations.
cmSystemToolsCMakeRoot = CMAKE_BOOTSTRAP_SOURCE_DIR;
cmSystemToolsCMakeCommand = exe;
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
std::string exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
#else
// Find resources relative to our own executable. // Find resources relative to our own executable.
std::string exe_dir = cmSystemTools::GetFilenamePath(exe); std::string exe_dir = cmSystemTools::GetFilenamePath(exe);
if (!FindCMakeResourcesInInstallTree(exe_dir)) { if (!FindCMakeResourcesInInstallTree(exe_dir)) {
@@ -2806,13 +2813,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
} }
cmSystemToolsCMakeCommand = cmSystemToolsCMakeCommand =
cmStrCat(exe_dir, "/cmake", cmSystemTools::GetExecutableExtension()); cmStrCat(exe_dir, "/cmake", cmSystemTools::GetExecutableExtension());
#else
// The bootstrap cmake knows its resource locations.
cmSystemToolsCMakeRoot = CMAKE_BOOTSTRAP_SOURCE_DIR;
cmSystemToolsCMakeCommand = exe;
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
std::string exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
#endif #endif
cmSystemToolsCTestCommand = cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension()); cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());