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

merge with dev

Browse Source
This commit is contained in:
Desmis
2020-03-19 13:40:11 +01:00
parent 54fdc848f0 d63fb77c8c
commit e573de78b4
169 changed files with 11568 additions and 5931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
rtengine/CMakeLists.txt
View File

@@ -1,35 +1,60 @@
include_directories(${EXTRA_INCDIR}
${EXPAT_INCLUDE_DIRS}
${FFTW3F_INCLUDE_DIRS}
${GLIB2_INCLUDE_DIRS}
${GLIBMM_INCLUDE_DIRS}
${GOBJECT_INCLUDE_DIRS}
${GTHREAD_INCLUDE_DIRS}
${GTKMM_INCLUDE_DIRS}
${GTK_INCLUDE_DIRS}
${IPTCDATA_INCLUDE_DIRS}
${LCMS_INCLUDE_DIRS}
${LENSFUN_INCLUDE_DIRS}
${RSVG_INCLUDE_DIRS}
)
if(EXTRA_INCDIR)
include_directories("${EXTRA_INCDIR}")
endif()
if(EXPAT_INCLUDE_DIRS)
include_directories("${EXPAT_INCLUDE_DIRS}")
endif()
if(FFTW3F_INCLUDE_DIRS)
include_directories("${FFTW3F_INCLUDE_DIRS}")
endif()
if(GLIB2_INCLUDE_DIRS)
include_directories("${GLIB2_INCLUDE_DIRS}")
endif()
if(GLIBMM_INCLUDE_DIRS)
include_directories("${GLIBMM_INCLUDE_DIRS}")
endif()
if(GOBJECT_INCLUDE_DIRS)
include_directories("${GOBJECT_INCLUDE_DIRS}")
endif()
if(GTHREAD_INCLUDE_DIRS)
include_directories("${GTHREAD_INCLUDE_DIRS}")
endif()
if(GTKMM_INCLUDE_DIRS)
include_directories("${GTKMM_INCLUDE_DIRS}")
endif()
if(GTK_INCLUDE_DIRS)
include_directories("${GTK_INCLUDE_DIRS}")
endif()
if(IPTCDATA_INCLUDE_DIRS)
include_directories("${IPTCDATA_INCLUDE_DIRS}")
endif()
if(LCMS_INCLUDE_DIRS)
include_directories("${LCMS_INCLUDE_DIRS}")
endif()
if(LENSFUN_INCLUDE_DIRS)
include_directories("${LENSFUN_INCLUDE_DIRS}")
endif()
if(RSVG_INCLUDE_DIRS)
include_directories("${RSVG_INCLUDE_DIRS}")
endif()
if(NOT WITH_SYSTEM_KLT)
include_directories("${CMAKE_SOURCE_DIR}/rtengine/klt")
else()
include_directories(${KLT_INCLUDE_DIRS})
include_directories("${KLT_INCLUDE_DIRS}")
endif()
link_directories("${PROJECT_SOURCE_DIR}/rtexif"
${EXPAT_LIBRARY_DIRS}
${EXTRA_LIBDIR}
${FFTW3F_LIBRARY_DIRS}
${GLIB2_LIBRARY_DIRS}
${GLIBMM_LIBRARY_DIRS}
${GOBJECT_LIBRARY_DIRS}
${GTHREAD_LIBRARY_DIRS}
${IPTCDATA_LIBRARY_DIRS}
${LCMS_LIBRARY_DIRS}
${LENSFUN_LIBRARY_DIRS}
${RSVG_LIBRARY_DIRS}
"${EXPAT_LIBRARY_DIRS}"
"${EXTRA_LIBDIR}"
"${FFTW3F_LIBRARY_DIRS}"
"${GLIB2_LIBRARY_DIRS}"
"${GLIBMM_LIBRARY_DIRS}"
"${GOBJECT_LIBRARY_DIRS}"
"${GTHREAD_LIBRARY_DIRS}"
"${IPTCDATA_LIBRARY_DIRS}"
"${LCMS_LIBRARY_DIRS}"
"${LENSFUN_LIBRARY_DIRS}"
"${RSVG_LIBRARY_DIRS}"
)
set(CAMCONSTSFILE "camconst.json")
@@ -101,6 +126,7 @@ set(RTENGINESOURCEFILES
ipretinex.cc
ipshadowshighlights.cc
ipsharpen.cc
ipsharpenedges.cc
ipsoftlight.cc
iptransform.cc
ipvibrance.cc
@@ -112,6 +138,7 @@ set(RTENGINESOURCEFILES
lj92.c
lmmse_demosaic.cc
loadinitial.cc
munselllch.cc
myfile.cc
panasonic_decoders.cc
pdaflinesfilter.cc
@@ -165,13 +192,13 @@ endif()
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
add_library(rtengine STATIC ${RTENGINESOURCEFILES})
add_library(rtengine STATIC "${RTENGINESOURCEFILES}")
add_dependencies(rtengine UpdateInfo)
# It may be nice to store library version too
if(BUILD_SHARED_LIBS)
install(TARGETS rtengine DESTINATION ${LIBDIR})
install(TARGETS rtengine DESTINATION "${LIBDIR}")
endif()
set_target_properties(rtengine PROPERTIES COMPILE_FLAGS "${RTENGINE_CXX_FLAGS}")