From 68a6e02369e263062b8dd8f24ae469aeaea47a98 Mon Sep 17 00:00:00 2001
From: Stefan Wunsch <stefan.wunsch@cern.ch>
Date: Mon, 1 Mar 2021 16:40:54 +0100
Subject: [PATCH] Fix some cmake build system issues (#6147)

* [cmake] Switch to find_package for TIFF
- Included in cmake 3.5 and later
- Provides better configuration messages
* Add missing TIFF library to rtgui and rtexif
* Removed unnecessary quotes so that cmake sees the list as a list
* Add OpenMP to rtengine if OpenMP is enabled
---
 CMakeLists.txt          | 2 +-
 rtengine/CMakeLists.txt | 8 ++++++++
 rtexif/CMakeLists.txt   | 8 ++++----
 rtgui/CMakeLists.txt    | 4 ++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2be1b6744..3b5dbc665 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -487,7 +487,7 @@ pkg_check_modules(LCMS REQUIRED lcms2>=2.6)
 pkg_check_modules(EXPAT REQUIRED expat>=2.1)
 pkg_check_modules(FFTW3F REQUIRED fftw3f)
 pkg_check_modules(IPTCDATA REQUIRED libiptcdata)
-pkg_check_modules(TIFF REQUIRED libtiff-4>=4.0.4)
+find_package(TIFF 4.0.4 REQUIRED)
 find_package(JPEG REQUIRED)
 find_package(PNG REQUIRED)
 find_package(ZLIB REQUIRED)
diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
index cb96daa03..ee575ae47 100644
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -57,6 +57,10 @@ link_directories("${PROJECT_SOURCE_DIR}/rtexif"
     "${RSVG_LIBRARY_DIRS}"
 )
 
+if(OpenMP_FOUND)
+    include_directories(${OpenMP_CXX_INCLUDE_DIRS})
+endif()
+
 set(CAMCONSTSFILE "camconst.json")
 
 set(RTENGINESOURCEFILES
@@ -223,4 +227,8 @@ target_link_libraries(rtengine rtexif
     ${KLT_LIBRARIES}
 )
 
+if(OpenMP_FOUND)
+    target_link_libraries(rtengine ${OpenMP_CXX_LIBRARIES})
+endif()
+
 install(FILES ${CAMCONSTSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
diff --git a/rtexif/CMakeLists.txt b/rtexif/CMakeLists.txt
index 836f832e2..e7ba81439 100644
--- a/rtexif/CMakeLists.txt
+++ b/rtexif/CMakeLists.txt
@@ -14,12 +14,12 @@ add_library(rtexif STATIC
 add_dependencies(rtexif UpdateInfo)
 
 if(WIN32)
-    include_directories(${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS})
-    link_directories(. "${PROJECT_SOURCE_DIR}/rtexif" ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${LENSFUN_LIBRARY_DIRS})
+    include_directories(${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS})
+    link_directories(. "${PROJECT_SOURCE_DIR}/rtexif" ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${LENSFUN_LIBRARY_DIRS} ${TIFF_LIBRARY_DIRS})
 else()
     set_target_properties(rtexif PROPERTIES COMPILE_FLAGS " -fPIC")
-    include_directories("${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS}")
-    link_directories("${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${LENSFUN_LIBRARY_DIRS}")
+    include_directories(${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS})
+    link_directories(${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${LENSFUN_LIBRARY_DIRS} ${TIFF_LIBRARY_DIRS})
 endif()
 
 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt
index 514204baf..5f8baed47 100644
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -192,6 +192,7 @@ if(WIN32)
         ${GTK_INCLUDE_DIRS}
         ${LENSFUN_INCLUDE_DIRS}
         ${RSVG_INCLUDE_DIRS}
+        ${TIFF_INCLUDE_DIRS}
         )
     link_directories(. "${PROJECT_SOURCE_DIR}/rtexif"
         ${EXTRA_LIBDIR}
@@ -203,6 +204,7 @@ if(WIN32)
         ${GTK_LIBRARY_DIRS}
         ${LENSFUN_LIBRARY_DIRS}
         ${RSVG_LIBRARY_DIRS}
+        ${TIFF_LIBRARY_DIRS}
         )
 else()
     include_directories(${EXTRA_INCDIR}
@@ -221,6 +223,7 @@ else()
         ${LCMS_INCLUDE_DIRS}
         ${LENSFUN_INCLUDE_DIRS}
         ${RSVG_INCLUDE_DIRS}
+        ${TIFF_INCLUDE_DIRS}
         )
     link_directories(${EXTRA_LIBDIR}
         ${CANBERRA-GTK_LIBRARY_DIRS}
@@ -238,6 +241,7 @@ else()
         ${LCMS_LIBRARY_DIRS}
         ${LENSFUN_LIBRARY_DIRS}
         ${RSVG_LIBRARY_DIRS}
+        ${TIFF_LIBRARY_DIRS}
         )
 endif()