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

Merge pull request #5539 from mattiaverga/klt

Browse Source 
Fix linking against system klt
This commit is contained in:
Beep6581
2020-02-06 09:53:35 +01:00
committed by GitHub
parent d35dc3f93b 9205b506b5
commit 44f2400993
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/CMakeLists.txt
View File

@@ -12,6 +12,11 @@ include_directories(${EXTRA_INCDIR}
${LENSFUN_INCLUDE_DIRS} ${LENSFUN_INCLUDE_DIRS}
${RSVG_INCLUDE_DIRS} ${RSVG_INCLUDE_DIRS}
) )
if(NOT WITH_SYSTEM_KLT)
include_directories("${CMAKE_SOURCE_DIR}/rtengine/klt")
else()
include_directories(${KLT_INCLUDE_DIRS})
endif()
link_directories("${PROJECT_SOURCE_DIR}/rtexif" link_directories("${PROJECT_SOURCE_DIR}/rtexif"
${EXPAT_LIBRARY_DIRS} ${EXPAT_LIBRARY_DIRS}
@@ -185,6 +190,7 @@ target_link_libraries(rtengine rtexif
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${LENSFUN_LIBRARIES} ${LENSFUN_LIBRARIES}
${RSVG_LIBRARIES} ${RSVG_LIBRARIES}
${KLT_LIBRARIES}
) )
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)

4
rtengine/calc_distort.cc
View File

@@ -5,8 +5,8 @@ locations (before and after tracking) to text files and to PPM files,
and prints the features to the screen. and prints the features to the screen.
**********************************************************************/ **********************************************************************/
#include "klt/pnmio.h" #include <pnmio.h>
#include "klt/klt.h" #include <klt.h>
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>