Merge branch 'dev' into multiframe-handling

2017-09-17 15:04:29 +02:00
parent 0905294bda fb06a75c81
commit 8cef3c5e2f
8 changed files with 15 additions and 7 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -179,6 +179,7 @@ if(WIN32)
        ${GLIBMM_LIBRARY_DIRS}
        ${GTKMM_LIBRARY_DIRS}
        ${GTK_LIBRARY_DIRS}
+        ${LENSFUN_LIBRARY_DIRS}
        )
 else()
    include_directories(${EXTRA_INCDIR}
@@ -211,6 +212,7 @@ else()
        ${GTK_LIBRARY_DIRS}
        ${IPTCDATA_LIBRARY_DIRS}
        ${LCMS_LIBRARY_DIRS}
+        ${LENSFUN_LIBRARY_DIRS}
        )
 endif()