liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some cmake build system issues (#6147)

Browse Source 
* [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
This commit is contained in:
Stefan Wunsch 2021-03-01 16:40:54 +01:00 committed by GitHub
parent cf21bd87d5
commit 68a6e02369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -487,7 +487,7 @@ pkg_check_modules(LCMS REQUIRED lcms2>=2.6)
pkg_check_modules(EXPAT REQUIRED expat>=2.1) pkg_check_modules(EXPAT REQUIRED expat>=2.1)
pkg_check_modules(FFTW3F REQUIRED fftw3f) pkg_check_modules(FFTW3F REQUIRED fftw3f)
pkg_check_modules(IPTCDATA REQUIRED libiptcdata) 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(JPEG REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)

8
rtengine/CMakeLists.txt
View File

@ -57,6 +57,10 @@ link_directories("${PROJECT_SOURCE_DIR}/rtexif"
"${RSVG_LIBRARY_DIRS}" "${RSVG_LIBRARY_DIRS}"
) )
if(OpenMP_FOUND)
include_directories(${OpenMP_CXX_INCLUDE_DIRS})
endif()
set(CAMCONSTSFILE "camconst.json") set(CAMCONSTSFILE "camconst.json")
set(RTENGINESOURCEFILES set(RTENGINESOURCEFILES
@ -223,4 +227,8 @@ target_link_libraries(rtengine rtexif
${KLT_LIBRARIES} ${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) install(FILES ${CAMCONSTSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)

8
rtexif/CMakeLists.txt
View File

@ -14,12 +14,12 @@ add_library(rtexif STATIC
add_dependencies(rtexif UpdateInfo) add_dependencies(rtexif UpdateInfo)
if(WIN32) if(WIN32)
include_directories(${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_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}) 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() else()
set_target_properties(rtexif PROPERTIES COMPILE_FLAGS " -fPIC") set_target_properties(rtexif PROPERTIES COMPILE_FLAGS " -fPIC")
include_directories("${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_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}") link_directories(${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${LENSFUN_LIBRARY_DIRS} ${TIFF_LIBRARY_DIRS})
endif() endif()
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")

4
rtgui/CMakeLists.txt
View File

@ -192,6 +192,7 @@ if(WIN32)
${GTK_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS}
${LENSFUN_INCLUDE_DIRS} ${LENSFUN_INCLUDE_DIRS}
${RSVG_INCLUDE_DIRS} ${RSVG_INCLUDE_DIRS}
${TIFF_INCLUDE_DIRS}
) )
link_directories(. "${PROJECT_SOURCE_DIR}/rtexif" link_directories(. "${PROJECT_SOURCE_DIR}/rtexif"
${EXTRA_LIBDIR} ${EXTRA_LIBDIR}
@ -203,6 +204,7 @@ if(WIN32)
${GTK_LIBRARY_DIRS} ${GTK_LIBRARY_DIRS}
${LENSFUN_LIBRARY_DIRS} ${LENSFUN_LIBRARY_DIRS}
${RSVG_LIBRARY_DIRS} ${RSVG_LIBRARY_DIRS}
${TIFF_LIBRARY_DIRS}
) )
else() else()
include_directories(${EXTRA_INCDIR} include_directories(${EXTRA_INCDIR}
@ -221,6 +223,7 @@ else()
${LCMS_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS}
${LENSFUN_INCLUDE_DIRS} ${LENSFUN_INCLUDE_DIRS}
${RSVG_INCLUDE_DIRS} ${RSVG_INCLUDE_DIRS}
${TIFF_INCLUDE_DIRS}
) )
link_directories(${EXTRA_LIBDIR} link_directories(${EXTRA_LIBDIR}
${CANBERRA-GTK_LIBRARY_DIRS} ${CANBERRA-GTK_LIBRARY_DIRS}
@ -238,6 +241,7 @@ else()
${LCMS_LIBRARY_DIRS} ${LCMS_LIBRARY_DIRS}
${LENSFUN_LIBRARY_DIRS} ${LENSFUN_LIBRARY_DIRS}
${RSVG_LIBRARY_DIRS} ${RSVG_LIBRARY_DIRS}
${TIFF_LIBRARY_DIRS}
) )
endif() endif()