Merge branch 'dev' into libraw-copylib

2024-03-02 21:01:34 -08:00
parent 6daf3f6a23 f687bda276
commit 51e52d9aba
110 changed files with 5275 additions and 4040 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -546,6 +546,10 @@ pkg_check_modules(LCMS REQUIRED lcms2>=2.6)
 pkg_check_modules(EXPAT REQUIRED expat>=2.1)
 pkg_check_modules(FFTW3F REQUIRED fftw3f)

+# By default little-cms2 uses 'register' keyword which is deprecated and removed in c++17
+# This definition forces not to use it
+add_definitions("-DCMS_NO_REGISTER_KEYWORD")
+
 #Set the appropriate FFTW flags on macOS
 if(APPLE AND OPTION_OMP)
        set(EXTRA_LIB "-L${LOCAL_PREFIX}/lib -lfftw3f_omp -lfftw3f -lm")