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: Clarify decision to look for resources from the build tree

Browse Source
This commit is contained in:
Brad King
2024-11-09 08:28:05 -05:00
parent cbee4eed0f
commit b91ec8c48f
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmSystemTools.cxx
View File

@@ -2741,6 +2741,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifndef CMAKE_BOOTSTRAP
// Find resources relative to our own executable.
std::string exe_dir = cmSystemTools::GetFilenamePath(exe);
bool found = false;
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
@@ -2748,15 +2749,21 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
if (cmHasLiteralSuffix(exe_dir, CMAKE_BIN_DIR)) {
std::string const prefix =
exe_dir.substr(0, exe_dir.size() - cmStrLen(CMAKE_BIN_DIR));
// Set cmSystemToolsCMakeRoot set to the location expected in an
// install tree, even if it does not exist, so that
// cmake::AddCMakePaths can print the location in its error message.
cmSystemToolsCMakeRoot = cmStrCat(prefix, CMAKE_DATA_DIR);
if (cmSystemTools::FileExists(
cmStrCat(prefix, CMAKE_DOC_DIR "/html/index.html"))) {
cmSystemToolsHTMLDoc = cmStrCat(prefix, CMAKE_DOC_DIR "/html");
cmStrCat(cmSystemToolsCMakeRoot, "/Modules/CMake.cmake"))) {
if (cmSystemTools::FileExists(
cmStrCat(prefix, CMAKE_DOC_DIR "/html/index.html"))) {
cmSystemToolsHTMLDoc = cmStrCat(prefix, CMAKE_DOC_DIR "/html");
}
found = true;
}
}
if (cmSystemToolsCMakeRoot.empty() ||
!cmSystemTools::FileExists(
cmStrCat(cmSystemToolsCMakeRoot, "/Modules/CMake.cmake"))) {
if (!found) {
// Build tree has "<build>/bin[/<config>]/cmake" and
// "<build>/CMakeFiles/CMakeSourceDir.txt".
std::string dir = cmSystemTools::GetFilenamePath(exe_dir);