Merge branch 'dev' into metadata-exiv2

rtengine/CMakeLists.txt

@@ -67,6 +67,7 @@ endif()
 set(CAMCONSTSFILE "camconst.json")
 
 set(RTENGINESOURCEFILES
+    alpha.cc
     ahd_demosaic_RT.cc
     amaze_demosaic_RT.cc
     badpixels.cc
@@ -142,7 +143,6 @@ set(RTENGINESOURCEFILES
     jpeg_ijg/jpeg_memsrc.cc
     labimage.cc
     lcp.cc
-    lj92.c
     lmmse_demosaic.cc
     loadinitial.cc
     metadata.cc
@@ -168,6 +168,7 @@ set(RTENGINESOURCEFILES
     rtthumbnail.cc
     shmap.cc
     simpleprocess.cc
+    spot.cc
     stdimagesource.cc
     tmo_fattal02.cc
     utils.cc
@@ -179,6 +180,19 @@ if(LENSFUN_HAS_LOAD_DIRECTORY)
     set_source_files_properties(rtlensfun.cc PROPERTIES COMPILE_DEFINITIONS RT_LENSFUN_HAS_LOAD_DIRECTORY)
 endif()
 
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.0")
+    # procparams.cc takes a long time to compile with optimizations starting
+    # with GCC 12.1 due to PTA (see issue #6548)
+    get_source_file_property(PROCPARAMS_COMPILE_OPTIONS procparams.cc COMPILE_OPTIONS)
+    if(PROCPARAMS_COMPILE_OPTIONS STREQUAL "NOTFOUND")
+        set(PROCPARAMS_COMPILE_OPTIONS "")
+    else()
+        set(PROCPARAMS_COMPILE_OPTIONS "${PROCPARAMS_COMPILE_OPTIONS};")
+    endif()
+    set(PROCPARAMS_COMPILE_OPTIONS "${PROCPARAMS_COMPILE_OPTIONS}-fno-tree-pta")
+    set_source_files_properties(procparams.cc PROPERTIES COMPILE_OPTIONS ${PROCPARAMS_COMPILE_OPTIONS})
+endif()
+
 if(WITH_BENCHMARK)
     add_definitions(-DBENCHMARK)
 endif()