Merge branch 'dev' into spot-removal-tool

2019-12-08 00:37:54 +01:00
parent 1cf62a2a65 ba36a92240
commit c23f976302
463 changed files with 16158 additions and 10338 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -79,7 +79,6 @@ set(NONCLISOURCEFILES
    hsvequalizer.cc
    iccprofilecreator.cc
    icmpanel.cc
-    ilabel.cc
    imagearea.cc
    imageareapanel.cc
    impulsedenoise.cc
@@ -287,6 +286,7 @@ target_link_libraries(rth rtengine
    ${ZLIB_LIBRARIES}
    ${LENSFUN_LIBRARIES}
    ${RSVG_LIBRARIES}
+    ${TCMALLOC_LIBRARIES}
    )

 target_link_libraries(rth-cli rtengine
@@ -308,6 +308,7 @@ target_link_libraries(rth-cli rtengine
    ${ZLIB_LIBRARIES}
    ${LENSFUN_LIBRARIES}
    ${RSVG_LIBRARIES}
+    ${TCMALLOC_LIBRARIES}
    )

 # Install executables