diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-19 13:09:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-19 13:10:15 (GMT) |
| commit | d2cbadf3b435af9d271b5ed174c56c16af771f79 (patch) | |
| tree | 9e3210ea8362b25b4dee9d9704b94d46e4c5c72b /Modules | |
| parent | 923cb0ed2faabd1e65b112af03066e6b77d31be1 (diff) | |
| parent | dc5098429b5bd6b5f5c61eb76dcdb79f022b323e (diff) | |
| download | CMake-d2cbadf3b435af9d271b5ed174c56c16af771f79.zip CMake-d2cbadf3b435af9d271b5ed174c56c16af771f79.tar.gz CMake-d2cbadf3b435af9d271b5ed174c56c16af771f79.tar.bz2 | |
Merge topic 'package-dispatch-apple'
dc5098429b CMakePackageConfigHelpers: Clarify Apple platform selection usage error
3b9586671c CMakePackageConfigHelpers: Clarify Apple platform selection template name
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9087
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakePackageConfigHelpers.cmake | 6 | ||||
| -rw-r--r-- | Modules/Internal/ApplePlatformSelection.cmake.in (renamed from Modules/Internal/PlatformSelectionFile.cmake.in) | 0 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake index 386c39d..407acff 100644 --- a/Modules/CMakePackageConfigHelpers.cmake +++ b/Modules/CMakePackageConfigHelpers.cmake @@ -430,6 +430,10 @@ function(generate_apple_platform_selection_file _output_file) set(_multi) cmake_parse_arguments(PARSE_ARGV 0 _gpsf "${_options}" "${_single}" "${_multi}") + if(NOT _gpsf_INSTALL_DESTINATION) + message(FATAL_ERROR "No INSTALL_DESTINATION given to generate_apple_platform_selection_file()") + endif() + set(_have_relative 0) foreach(_opt IN LISTS _config_file_options) if(_gpsf_${_opt}) @@ -444,7 +448,7 @@ function(generate_apple_platform_selection_file _output_file) endif() endforeach() - configure_package_config_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/Internal/PlatformSelectionFile.cmake.in" "${_output_file}" + configure_package_config_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/Internal/ApplePlatformSelection.cmake.in" "${_output_file}" INSTALL_DESTINATION "${_gpsf_INSTALL_DESTINATION}" NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO diff --git a/Modules/Internal/PlatformSelectionFile.cmake.in b/Modules/Internal/ApplePlatformSelection.cmake.in index 493d650..493d650 100644 --- a/Modules/Internal/PlatformSelectionFile.cmake.in +++ b/Modules/Internal/ApplePlatformSelection.cmake.in |