mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-09-25 04:09:36 +03:00
Merge topic 'normalize-install-path'
0f1ba8f6bb install: Normalize DESTINATION `.`
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11755
This commit is contained in:
@@ -217,6 +217,10 @@ bool cmInstallGenerator::InstallsForConfig(std::string const& config)
|
||||
std::string cmInstallGenerator::ConvertToAbsoluteDestination(
|
||||
std::string const& dest)
|
||||
{
|
||||
if (dest == ".") {
|
||||
return "${CMAKE_INSTALL_PREFIX}";
|
||||
}
|
||||
|
||||
std::string result;
|
||||
if (!dest.empty() && !cmSystemTools::FileIsFullPath(dest)) {
|
||||
result = "${CMAKE_INSTALL_PREFIX}/";
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
-- Installing: [^
|
||||
]+/Tests/RunCMake/install/FILES-DESTINATION-dot-build/root-all/empty\.c
|
||||
@@ -0,0 +1 @@
|
||||
install(FILES empty.c DESTINATION ".")
|
||||
@@ -127,6 +127,7 @@ if(CMake_TEST_ISPC)
|
||||
run_install_test(FILES-EXTRA_ISPC_TARGET_OBJECTS)
|
||||
endif()
|
||||
|
||||
run_install_test(FILES-DESTINATION-dot)
|
||||
|
||||
run_install_test(TARGETS-InstallFromSubDir)
|
||||
run_install_test(TARGETS-OPTIONAL)
|
||||
|
||||
Reference in New Issue
Block a user