CODECS: Don't use REQUIRED with find_library() as it requires CMake 3.18

HappySeaFox · Dec 9, 2023 · f60af90 · f60af90
1 parent 3bddd3f
commit f60af90
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/sail-codecs/jpegxl/CMakeLists.txt b/src/sail-codecs/jpegxl/CMakeLists.txt
@@ -1,9 +1,15 @@
-find_library(JPEGXL_LIBRARY jxl                 NAMES jxl jxl-static                 ${SAIL_CODEC_JPEGXL_REQUIRED_OPTION})
-find_library(JPEGXL_THREADS_LIBRARY jxl_threads NAMES jxl_threads jxl_threads-static ${SAIL_CODEC_JPEGXL_REQUIRED_OPTION})
-find_path(JPEGXL_INCLUDE_DIRS jxl/decode.h                                           ${SAIL_CODEC_JPEGXL_REQUIRED_OPTION})
+# Don't use SAIL_CODEC_JPEGXL_REQUIRED_OPTION as it requires CMake 3.18
+#
+find_library(JPEGXL_LIBRARY jxl                 NAMES jxl jxl-static)
+find_library(JPEGXL_THREADS_LIBRARY jxl_threads NAMES jxl_threads jxl_threads-static)
+find_path(JPEGXL_INCLUDE_DIRS jxl/decode.h)
 
 if (NOT JPEGXL_LIBRARY OR NOT JPEGXL_THREADS_LIBRARY OR NOT JPEGXL_INCLUDE_DIRS)
-    return()
+    if (SAIL_CODEC_JPEGXL_REQUIRED_OPTION STREQUAL "REQUIRED")
+        message(FATAL_ERROR "JPEGXL: Missing dependencies")
+    else()
+        return()
+    endif()
 endif()
 
 # Find dependencies for static builds as libjxl doesn't provide CMake configs

diff --git a/src/sail-codecs/svg/CMakeLists.txt b/src/sail-codecs/svg/CMakeLists.txt
@@ -5,10 +5,16 @@ find_path(SVG_INCLUDE_DIRS resvg.h)
 #
 if (NOT SVG_LIBRARY OR NOT SVG_INCLUDE_DIRS)
     set(SVG_LIBRARY "")
-    find_path(SVG_INCLUDE_DIRS nanosvg/nanosvg.h ${SAIL_CODEC_SVG_REQUIRED_OPTION})
+    # Don't use SAIL_CODEC_SVG_REQUIRED_OPTION as it requires CMake 3.18
+    #
+    find_path(SVG_INCLUDE_DIRS nanosvg/nanosvg.h)
 
     if (NOT SVG_INCLUDE_DIRS)
-        return()
+        if (SAIL_CODEC_SVG_REQUIRED_OPTION STREQUAL "REQUIRED")
+            message(FATAL_ERROR "SVG: Missing dependencies")
+        else()
+            return()
+        endif()
     endif()
 else()
     set(SAIL_RESVG ON)