mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Merge branch 'backport-4.0-cmake-P-script-case'

Browse Source
This commit is contained in:
Brad King
2026-04-13 14:23:26 -04:00
parent d7180925ff a3358bb66a
commit a2f1866d86
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmake.cxx
+2 -2
View File
@@ -667,7 +667,7 @@ bool cmake::SetCacheArgs(std::vector<std::string> const& args)
cmake::CommandFailureAction::FATAL_ERROR);
state->SetHomeDirectory(cmSystemTools::GetLogicalWorkingDirectory());
state->SetHomeOutputDirectory(cmSystemTools::GetLogicalWorkingDirectory());
state->ReadListFile(args, path);
state->ReadListFile(args, cmSystemTools::ToNormalizedPathOnDisk(path));
return true;
};
@@ -808,7 +808,7 @@ void cmake::ReadListFile(std::vector<std::string> const& args,
snapshot.SetDefaultDefinitions();
cmMakefile mf(gg, snapshot);
if (this->GetWorkingMode() != NORMAL_MODE) {
mf.SetScriptModeFile(cmSystemTools::ToNormalizedPathOnDisk(path));
mf.SetScriptModeFile(path);
mf.SetArgcArgv(args);
}
if (!cmSystemTools::FileExists(path, true)) {
Tests/RunCMake/CommandLine/P_PathOnDisk-stdout.txt
+2
View File
@@ -0,0 +1,2 @@
^-- CMAKE_SCRIPT_MODE_FILE='[^']*/Tests/RunCMake/CommandLine/P_PathOnDisk.cmake'
-- CMAKE_CURRENT_LIST_FILE='[^']*/Tests/RunCMake/CommandLine/P_PathOnDisk.cmake'$
Tests/RunCMake/CommandLine/P_PathOnDisk.cmake
+2
View File
@@ -0,0 +1,2 @@
message(STATUS "CMAKE_SCRIPT_MODE_FILE='${CMAKE_SCRIPT_MODE_FILE}'")
message(STATUS "CMAKE_CURRENT_LIST_FILE='${CMAKE_CURRENT_LIST_FILE}'")
Tests/RunCMake/CommandLine/P_no-file-stderr.txt
+4 -2
View File
@@ -1,2 +1,4 @@
^CMake Error: Not a file: nosuchscriptfile\.cmake
CMake Error: Error processing file: nosuchscriptfile\.cmake$
^CMake Error: Not a file: [^
]*/Tests/RunCMake/CommandLine/P_no-file-build/nosuchscriptfile\.cmake
CMake Error: Error processing file: [^
]*/Tests/RunCMake/CommandLine/P_no-file-build/nosuchscriptfile\.cmake$
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+6
View File
@@ -70,6 +70,12 @@ run_cmake_command(P_P_in_arbitrary_args ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_D
run_cmake_command(P_P_in_arbitrary_args_2 ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/P_arbitrary_args.cmake" -- -P -o)
run_cmake_command(P_fresh ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/P_fresh.cmake" --fresh)
if(CMAKE_HOST_WIN32)
run_cmake_command(P_PathOnDisk ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/../CommandLine/P_pathondisk.cmake")
else()
run_cmake_command(P_PathOnDisk ${CMAKE_COMMAND} -P "${RunCMake_SOURCE_DIR}/../CommandLine/P_PathOnDisk.cmake")
endif()
run_cmake_command(build-no-dir
${CMAKE_COMMAND} --build)
run_cmake_command(build-no-dir2