[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/frameworks] /: remove GLib2 linking rules (not used since lensfun and liblqr are optional d
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2015-03-02 10:00:14
Message-ID: E1YSN94-0006vh-Ri () scm ! kde ! org
[Download RAW message or body]

Git commit 9ca7fd36694a4b841ff8da2e493c077f7988da8c by Gilles Caulier.
Committed on 02/03/2015 at 09:58.
Pushed by cgilles into branch 'frameworks'.

remove GLib2 linking rules (not used since lensfun and liblqr are optional dependedncies)
Fix rules to link with lqr an lensfun. Only DImg is linked with these shared libs.

M  +0    -3    CMakeLists.txt
M  +1    -6    app/CMakeLists.txt
M  +3    -7    imageplugins/enhance/CMakeLists.txt
M  +5    -5    imageplugins/transform/CMakeLists.txt
M  +1    -1    libs/dimg/CMakeLists.txt
M  +1    -2    utilities/queuemanager/CMakeLists.txt

http://commits.kde.org/digikam/9ca7fd36694a4b841ff8da2e493c077f7988da8c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79c6890..fe95f68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -434,9 +434,6 @@ if(DIGIKAM_CAN_BE_COMPILED)
 
     add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_USE_FAST_OPERATOR_PLUS)
 
-    # surpress deprecated warning for glibc 2.20+
-    add_definitions(-D_DEFAULT_SOURCE)
-
     # translations catalog
     add_definitions(-DTRANSLATION_DOMAIN=\"digikam\")
 
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 34f5619..bddc2ac 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -163,7 +163,7 @@ target_link_libraries(digikamgui
                       fuzzysearch
                       maintenance
                       fileactionmanager
-                      
+
                       Qt5::Core
                       Qt5::Gui
                       Qt5::Widgets
@@ -186,11 +186,6 @@ if(ENABLE_MEDIAPLAYER)
     target_link_libraries(digikamgui Qt5::Multimedia Qt5::MultimediaWidgets)
 endif()
 
-# For Contents Aware Resizer and Lens auto-correction tools.
-if(GLIB2_FOUND)
-    target_link_libraries(digikamgui ${GLIB2_LIBRARIES})
-endif()
-
 if(APPLE)
     target_link_libraries(digikamgui /System/Library/Frameworks/AppKit.framework)
 endif()
diff --git a/imageplugins/enhance/CMakeLists.txt b/imageplugins/enhance/CMakeLists.txt
index d3e8460..34314af 100644
--- a/imageplugins/enhance/CMakeLists.txt
+++ b/imageplugins/enhance/CMakeLists.txt
@@ -19,7 +19,7 @@ set(digikamimageplugin_enhance_PART_SRCS imageplugin_enhance.cpp
                                          hotpixels/blackframelistview.cpp
                                          hotpixels/hotpixelfixer.cpp
                                          hotpixels/hotpixelstool.cpp
-   )
+)
 
 if(LENSFUN_FOUND)
     set(digikamimageplugin_enhance_PART_SRCS ${digikamimageplugin_enhance_PART_SRCS}
@@ -29,13 +29,9 @@ endif()
 
 add_library(digikamimageplugin_enhance MODULE ${digikamimageplugin_enhance_PART_SRCS})
 
-target_link_libraries(digikamimageplugin_enhance
-                      editorplugin
-)
+# NOTE: no need to link with lensfun library here. DImg is already linked in core.
 
-if(LENSFUN_FOUND)
-   target_link_libraries(digikamimageplugin_enhance ${LENSFUN_LIBRARIES})
-endif()
+target_link_libraries(digikamimageplugin_enhance editorplugin)
 
 install(TARGETS digikamimageplugin_enhance             DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES digikamimageplugin_enhance_ui.rc         DESTINATION ${KXMLGUI_INSTALL_DIR}/digikam)
diff --git a/imageplugins/transform/CMakeLists.txt b/imageplugins/transform/CMakeLists.txt
index 9ef2f94..92af9b0 100644
--- a/imageplugins/transform/CMakeLists.txt
+++ b/imageplugins/transform/CMakeLists.txt
@@ -16,9 +16,9 @@ set(digikamimageplugin_transform_PART_SRCS imageplugin_transform.cpp
 
                                            imageselectionwidget.cpp
                                            ratiocroptool.cpp
-   )
+)
 
-if(GLIB2_FOUND)
+if(LQR-1_FOUND)
     set(digikamimageplugin_transform_PART_SRCS ${digikamimageplugin_transform_PART_SRCS}
         contentawareresizetool.cpp
        )
@@ -26,9 +26,9 @@ endif()
 
 add_library(digikamimageplugin_transform MODULE ${digikamimageplugin_transform_PART_SRCS})
 
-target_link_libraries(digikamimageplugin_transform
-                      editorplugin
-)
+target_link_libraries(digikamimageplugin_transform editorplugin)
+
+# NOTE: no need to link with lqr-1 library here. DImg is already linked in core.
 
 install(TARGETS digikamimageplugin_transform             DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES digikamimageplugin_transform_ui.rc         DESTINATION ${KXMLGUI_INSTALL_DIR}/digikam)
diff --git a/libs/dimg/CMakeLists.txt b/libs/dimg/CMakeLists.txt
index ccfcc5a..dd3a849 100644
--- a/libs/dimg/CMakeLists.txt
+++ b/libs/dimg/CMakeLists.txt
@@ -246,7 +246,7 @@ target_include_directories(dimg
                                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dklcms>
 )
 
-# TODO ugly way to expose lensfun include dirs to users of dimg..
+# TODO ugly way to expose lensfun include dirs to users of dimg.
 if(LENSFUN_FOUND)
     target_include_directories(dimg PUBLIC ${LENSFUN_INCLUDE_DIRS})
     target_link_libraries(dimg ${LENSFUN_LIBRARIES})
diff --git a/utilities/queuemanager/CMakeLists.txt b/utilities/queuemanager/CMakeLists.txt
index fd12dd7..87d37dc 100644
--- a/utilities/queuemanager/CMakeLists.txt
+++ b/utilities/queuemanager/CMakeLists.txt
@@ -94,7 +94,6 @@ target_include_directories(queuemanager PUBLIC
 
 target_link_libraries(queuemanager
 
-
                       KF5::I18n # verify if needed
                       KF5::KExiv2
                       KF5::KDcraw
@@ -104,5 +103,5 @@ if(LENSFUN_FOUND)
     message(INFO " move lensfun to its own library")
     target_link_libraries(queuemanager dimg)
 endif()
-                     
+
 install( FILES main/queuemgrwindowui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/digikam )
[prev in list] [next in list] [prev in thread] [next in thread]