mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 01:09:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

CMakePackageConfigHelpers: Use unique variable name for pkg prefix

Browse Source 
Fixes: #25827
This commit is contained in:
Craig Scott
2024-03-30 18:51:47 +11:00
parent 91b9d35608
commit 6ddf8712cd
6 changed files with 137 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Modules/CMakePackageConfigHelpers.cmake
View File

@@ -377,6 +377,24 @@ macro(WRITE_BASIC_PACKAGE_VERSION_FILE)
write_basic_config_version_file(${ARGN})
endmacro()
function(__CMAKE_get_config_file_package_prefix outvar)
get_property(counter GLOBAL PROPERTY CMAKE_CONFIGURE_PACKAGE_CONFIG_FILE_COUNTER)
if(NOT counter)
set(counter 1)
set_property(GLOBAL PROPERTY CMAKE_CONFIGURE_PACKAGE_CONFIG_FILE_COUNTER ${counter})
endif()
set(${outvar} "PACKAGE_\${CMAKE_FIND_PACKAGE_NAME}_COUNTER_${counter}" PARENT_SCOPE)
endfunction()
function(__CMAKE_increment_config_file_counter)
get_property(counter GLOBAL PROPERTY CMAKE_CONFIGURE_PACKAGE_CONFIG_FILE_COUNTER)
if(NOT counter)
message(FATAL_ERROR "Internal error: global counter unexpectedly not set")
endif()
math(EXPR counter "${counter} + 1")
set_property(GLOBAL PROPERTY CMAKE_CONFIGURE_PACKAGE_CONFIG_FILE_COUNTER ${counter})
endfunction()
function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
set(options NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO)
set(oneValueArgs INSTALL_DESTINATION INSTALL_PREFIX)
@@ -412,15 +430,17 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${absInstallDir}" "${installPrefix}" )
__CMAKE_get_config_file_package_prefix(prefix_dir)
foreach(var ${CCF_PATH_VARS})
if(NOT DEFINED ${var})
message(FATAL_ERROR "Variable ${var} does not exist")
else()
if(IS_ABSOLUTE "${${var}}")
string(REPLACE "${installPrefix}" "\${PACKAGE_PREFIX_DIR}"
string(REPLACE "${installPrefix}" "\${${prefix_dir}}"
PACKAGE_${var} "${${var}}")
else()
set(PACKAGE_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
set(PACKAGE_${var} "\${${prefix_dir}}/${${var}}")
endif()
endif()
endforeach()
@@ -432,7 +452,7 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
####### Any changes to this file will be overwritten by the next CMake run ####
####### The input file was ${inputFileName} ########
get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
get_filename_component(${prefix_dir} \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
")
if("${absInstallDir}" MATCHES "^(/usr)?/lib(64)?/.+")
@@ -443,7 +463,7 @@ get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE
get_filename_component(_realCurr \"\${CMAKE_CURRENT_LIST_DIR}\" REALPATH)
get_filename_component(_realOrig \"${absInstallDir}\" REALPATH)
if(_realCurr STREQUAL _realOrig)
set(PACKAGE_PREFIX_DIR \"${installPrefix}\")
set(${prefix_dir} \"${installPrefix}\")
endif()
unset(_realOrig)
unset(_realCurr)
@@ -481,6 +501,10 @@ endmacro()
configure_file("${_inputFile}" "${_outputFile}" @ONLY)
# We're done writing the file. Make sure the next one has a unique prefix dir
# variable name (we may have multiple config files for the one package)
__CMAKE_increment_config_file_counter()
endfunction()
function(generate_apple_platform_selection_file _output_file)
@@ -521,12 +545,14 @@ function(generate_apple_platform_selection_file _output_file)
set(_branch_INIT "")
endif()
__CMAKE_get_config_file_package_prefix(prefix_dir)
set(_else ELSE)
foreach(_opt IN LISTS _config_file_options _else)
if(_gpsf_${_opt})
set(_config_file "${_gpsf_${_opt}}")
if(NOT IS_ABSOLUTE "${_config_file}")
string(PREPEND _config_file [[${PACKAGE_PREFIX_DIR}/]])
string(PREPEND _config_file "\${${prefix_dir}}/")
endif()
set(_branch_${_opt} "include(\"${_config_file}\")")
elseif(_gpsf_ERROR_VARIABLE)
@@ -600,11 +626,13 @@ function(generate_apple_architecture_selection_file _output_file)
"endif()\n"
)
__CMAKE_get_config_file_package_prefix(prefix_dir)
foreach(pair IN ZIP_LISTS _gasf_SINGLE_ARCHITECTURES _gasf_SINGLE_ARCHITECTURE_INCLUDE_FILES)
set(arch "${pair_0}")
set(config_file "${pair_1}")
if(NOT IS_ABSOLUTE "${config_file}")
string(PREPEND config_file [[${PACKAGE_PREFIX_DIR}/]])
string(PREPEND config_file "\${${prefix_dir}}/")
endif()
string(APPEND _branch_code
"\n"
@@ -619,7 +647,7 @@ function(generate_apple_architecture_selection_file _output_file)
string(JOIN " " universal_archs "${_gasf_UNIVERSAL_ARCHITECTURES}")
set(config_file "${_gasf_UNIVERSAL_INCLUDE_FILE}")
if(NOT IS_ABSOLUTE "${config_file}")
string(PREPEND config_file [[${PACKAGE_PREFIX_DIR}/]])
string(PREPEND config_file "\${${prefix_dir}}/")
endif()
string(APPEND _branch_code
"\n"