mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 13:51:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

file(REAL_PATH): Ensure same behavior as get_filename_component(REALPATH)

Browse Source 
Fixes: #24605
This commit is contained in:
Marc Chevrier
2023-03-19 13:32:02 +01:00
parent c3110a500e
commit 1d12853ed3
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmFileCommand.cxx
View File

@@ -30,7 +30,6 @@
#include "cmArgumentParser.h"
#include "cmArgumentParserTypes.h"
#include "cmCMakePath.h"
#include "cmCryptoHash.h"
#include "cmELF.h"
#include "cmExecutionStatus.h"
@@ -1278,9 +1277,9 @@ bool HandleRealPathCommand(std::vector<std::string> const& args,
}
}
cmCMakePath path(input, cmCMakePath::auto_format);
path = path.Absolute(*arguments.BaseDirectory).Normal();
auto realPath = cmSystemTools::GetRealPath(path.GenericString());
auto realPath =
cmSystemTools::CollapseFullPath(input, *arguments.BaseDirectory);
realPath = cmSystemTools::GetRealPath(realPath);
status.GetMakefile().AddDefinition(args[2], realPath);

16
Tests/RunCMake/file/REAL_PATH.cmake
View File

@@ -34,3 +34,19 @@ file(REAL_PATH "~/test.txt" real_path EXPAND_TILDE)
if (NOT real_path STREQUAL "${HOME_DIR}/test.txt")
message(SEND_ERROR "real path is \"${real_path}\", should be \"${HOME_DIR}/test.txt\"")
endif()
if (WIN32)
cmake_policy(SET CMP0139 NEW)
set(in "${CMAKE_CURRENT_BINARY_DIR}/AbC.TxT")
file(REMOVE "${in}")
file(TOUCH "${in}")
string(TOLOWER "${in}" low)
file(REAL_PATH "${low}" out)
if(NOT "${out}" PATH_EQUAL "${in}")
message(SEND_ERROR "real path is \"${out}\", should be \"${in}\"")
endif()
endif()