Merge branch 'master' of https://github.com/mm2/Little-CMS

Author: mm2

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4.32.0
+      uses: github/codeql-action/init@v4.32.4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4.32.0
+      uses: github/codeql-action/autobuild@v4.32.4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -69,4 +69,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4.32.0
+      uses: github/codeql-action/analyze@v4.32.4

.github/workflows/scorecard.yml

@@ -42,14 +42,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f985be5b50bd175586d44aac9ac52926adf12893 # v2.24.0
+        uses: github/codeql-action/upload-sarif@0ec47d036c68ae0cf94c629009b1029407111281 # v2.24.0
         with:
           sarif_file: results.sarif

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).

cmake/lcms2-config.cmake.in

@@ -0,0 +1,3 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/lcms2-targets.cmake")