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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Use the CMake API to enable optimized linking.
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2012-02-01 0:10:47
Message-ID: 20120201001047.E2659A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit 1fe778bca46d7e839412ef751e167bf4fa43f52c by Stephen Kelly.
Committed on 01/02/2012 at 00:59.
Pushed by skelly into branch 'frameworks'.

Use the CMake API to enable optimized linking.

M  +10   -0    CMakeLists.txt
M  +0    -1    cmake/modules/FindKDE4Internal.cmake
M  +0    -11   cmake/modules/KDE4Macros.cmake

http://commits.kde.org/kdelibs/1fe778bca46d7e839412ef751e167bf4fa43f52c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d9fe1b..53ea27d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,16 @@ add_subdirectory( tier1 )
 set(CMAKE_AUTOMOC_RELAXED_MODE ON)
 set(CMAKE_AUTOMOC ON)
 
+
+# By default don't add any linked libraries to the "exported"
+# link interfaces of shared libraries, so that executables linking
+# against these libraries will not automatically add implicit
+# dependencies to their link list.
+#
+# This reduces inter-package dependencies and makes it easier to remove
+# dependencies of shared libraries without breaking binary compatibility.
+set(CMAKE_LINK_INTERFACE_LIBRARIES "")
+
 ################# write platform profile file which will be installed \
#################  include(CreateKDEPlatformProfile.cmake)
 
diff --git a/cmake/modules/FindKDE4Internal.cmake \
b/cmake/modules/FindKDE4Internal.cmake index 70d0ebc..707b1f2 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -222,7 +222,6 @@
 #
 #  KDE4_ADD_LIBRARY (name [STATIC | SHARED | MODULE ] file1 ... fileN)
 #    Equivalent to ADD_LIBRARY().
-#    sets LINK_INTERFACE_LIBRARIES target property empty.
 #    The RPATH is set according to the global RPATH settings as set up by \
FindKDE4Internal.cmake  #    (CMAKE_SKIP_BUILD_RPATH=FALSE, \
CMAKE_BUILD_WITH_INSTALL_RPATH=FALSE, CMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE)  #    \
                Under Windows it adds a -DMAKE_<name>_LIB definition to the \
                compilation.
diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
index 5f13c8f..5053d0d 100644
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
@@ -934,17 +934,6 @@ macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
    string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol})
    set(_symbol "MAKE_${_symbol}_LIB")
    set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol})
-
-   # By default don't add any linked libraries to the "exported"
-   # link interfaces, so that executables linking against this library
-   # will not automatically add implicit dependencies to their link list.
-   #
-   # This reduces inter-package dependencies and makes it easier to remove
-   # dependencies of shared libraries without breaking binary compatibility.
-   if(NOT "${_add_lib_param}" STREQUAL "STATIC")
-      set_target_properties(${_target_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "" )
-   endif(NOT "${_add_lib_param}" STREQUAL "STATIC")
-
 endmacro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
 
 macro(kf5_add_library _target_NAME _lib_TYPE)


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