From 7aaceb1b9275e4bc5a4906a9ba821490ec7c08f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= <4973094+kmilos@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:43:53 +0100 Subject: [PATCH 1/2] Update and rename lcms2Config.cmake.in to lcms2-config.cmake.in --- cmake/lcms2-config.cmake.in | 3 +++ cmake/lcms2Config.cmake.in | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 cmake/lcms2-config.cmake.in delete mode 100644 cmake/lcms2Config.cmake.in diff --git a/cmake/lcms2-config.cmake.in b/cmake/lcms2-config.cmake.in new file mode 100644 index 00000000..ab962684 --- /dev/null +++ b/cmake/lcms2-config.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/lcms2-targets.cmake") diff --git a/cmake/lcms2Config.cmake.in b/cmake/lcms2Config.cmake.in deleted file mode 100644 index 76b9abf6..00000000 --- a/cmake/lcms2Config.cmake.in +++ /dev/null @@ -1,5 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/lcms2Targets.cmake") - - From 90556eb0bdeabd77a4867182298e36d9ec7d9847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= <4973094+kmilos@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:52:52 +0100 Subject: [PATCH 2/2] CMake: use alternative exported config naming scheme --- cmake/Lcms2Packaging.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/Lcms2Packaging.cmake b/cmake/Lcms2Packaging.cmake index 61474a7b..ee926199 100644 --- a/cmake/Lcms2Packaging.cmake +++ b/cmake/Lcms2Packaging.cmake @@ -38,7 +38,7 @@ function(lcms2_setup_packaging) if(_install_targets) install( TARGETS ${_install_targets} - EXPORT lcms2Targets + EXPORT lcms2-targets RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" @@ -58,35 +58,35 @@ function(lcms2_setup_packaging) set(_lcms2_cmake_config_dir "${CMAKE_INSTALL_LIBDIR}/cmake/lcms2") install( - EXPORT lcms2Targets + EXPORT lcms2-targets NAMESPACE lcms2:: DESTINATION "${_lcms2_cmake_config_dir}" ) configure_package_config_file( - "${PROJECT_SOURCE_DIR}/cmake/lcms2Config.cmake.in" - "${PROJECT_BINARY_DIR}/lcms2Config.cmake" + "${PROJECT_SOURCE_DIR}/cmake/lcms2-config.cmake.in" + "${PROJECT_BINARY_DIR}/lcms2-config.cmake" INSTALL_DESTINATION "${_lcms2_cmake_config_dir}" ) write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/lcms2ConfigVersion.cmake" + "${PROJECT_BINARY_DIR}/lcms2-config-version.cmake" VERSION "${PROJECT_VERSION}" COMPATIBILITY SameMajorVersion ) install( FILES - "${PROJECT_BINARY_DIR}/lcms2Config.cmake" - "${PROJECT_BINARY_DIR}/lcms2ConfigVersion.cmake" + "${PROJECT_BINARY_DIR}/lcms2-config.cmake" + "${PROJECT_BINARY_DIR}/lcms2-config-version.cmake" DESTINATION "${_lcms2_cmake_config_dir}" ) # Build-tree export for local consumption. export( - EXPORT lcms2Targets + EXPORT lcms2-targets NAMESPACE lcms2:: - FILE "${PROJECT_BINARY_DIR}/lcms2Targets.cmake" + FILE "${PROJECT_BINARY_DIR}/lcms2-targets.cmake" ) # pkg-config generation (mirrors lcms2.pc.in semantics).