diff options
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 29 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 7 |
2 files changed, 19 insertions, 17 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 13752006..7a7a02a5 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -603,18 +603,23 @@ else(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} VERSIO endif(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} VERSION_GREATER 2.6.2) -# This is for the reduced link interface. -# In kdelibs it is already alwaysenabled. -# In all other modules provide the switch _KDE4_USE_REDUCED_LINK_INTERFACE to turn it on. -if(kdelibs_SOURCE_DIR) - set(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT TRUE) -else(kdelibs_SOURCE_DIR) - option(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT "Enable the reduced link interface" OFF) -endif(kdelibs_SOURCE_DIR) - -# Setting the target property LINK_INTERFACE_LIBRARIES directly shouldn't be done, -# instead TARGET_LINK_LIBRARIES(... LINK_INTERFACE_LIBRARIES ... ) must be used. -set(KDE4_DISABLE_PROPERTY_ "DISABLED_") +# This is obsolete now. I just keep it here so in case somebody stumbles upon it somewhere +# he can still find a hint where it came from and what it was good for. +# +# What to do in that case ? Just remove it. Alex +# +# # This is for the reduced link interface. +# # In kdelibs it is already alwaysenabled. +# # In all other modules provide the switch _KDE4_USE_REDUCED_LINK_INTERFACE to turn it on. +# if(kdelibs_SOURCE_DIR) +# set(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT TRUE) +# else(kdelibs_SOURCE_DIR) +# option(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT "Enable the reduced link interface" OFF) +# endif(kdelibs_SOURCE_DIR) +# +# # Setting the target property LINK_INTERFACE_LIBRARIES directly shouldn't be done, +# # instead TARGET_LINK_LIBRARIES(... LINK_INTERFACE_LIBRARIES ... ) must be used. +# set(KDE4_DISABLE_PROPERTY_ "DISABLED_") diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index b5300836..b6987111 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -861,17 +861,14 @@ macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) 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" + # 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") - # only do this inside kdelibs for now (so there is not too much breakage all at once, Alex - if(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT) - set_target_properties(${_target_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "" ) - endif(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT) + set_target_properties(${_target_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "" ) endif(NOT "${_add_lib_param}" STREQUAL "STATIC") endmacro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) |