1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: quote paths to prevent issues when no install prefix is set

Browse Source 
Change-Id: Ifa7f1ef70c4893e10cb4ce9a54d8a0806d19be93
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Jean-Michaël Celerier 2020-06-05 11:05:05 +02:00
parent 999c79863c
commit 35608c0761
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -283,7 +283,7 @@ function(qt_compute_relative_path_from_cmake_config_dir_to_prefix)
endif() endif()
file(RELATIVE_PATH file(RELATIVE_PATH
qt_path_from_cmake_config_dir_to_prefix qt_path_from_cmake_config_dir_to_prefix
${clean_config_prefix} ${CMAKE_INSTALL_PREFIX}) "${clean_config_prefix}" "${CMAKE_INSTALL_PREFIX}")
set(qt_path_from_cmake_config_dir_to_prefix "${qt_path_from_cmake_config_dir_to_prefix}" set(qt_path_from_cmake_config_dir_to_prefix "${qt_path_from_cmake_config_dir_to_prefix}"
PARENT_SCOPE) PARENT_SCOPE)
endfunction() endfunction()

2
src/corelib/CMakeLists.txt
View File

@ -14,7 +14,7 @@ else()
get_filename_component(_clean_prefix "${QT_CONFIG_BUILD_DIR}" ABSOLUTE) get_filename_component(_clean_prefix "${QT_CONFIG_BUILD_DIR}" ABSOLUTE)
endif() endif()
file(RELATIVE_PATH QT_INVERSE_CONFIG_INSTALL_DIR file(RELATIVE_PATH QT_INVERSE_CONFIG_INSTALL_DIR
${_clean_prefix} ${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}) "${_clean_prefix}" "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}")
# special case end # special case end