From 9e8a357597444568182924f3248ffe07bd8a8634 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 21 Jul 2008 19:19:06 +0000 Subject: [PATCH] -also disable _KDE4_TARGET_LINK_INTERFACE_LIBRARIES() and use the renamed LINK_INTERFACE_LIBRARIES target property instead: set_target_properties(foo PROPERTIES ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdeui;kdecore" ) While this doesn't look very nice, it is completely forward and backward compatible (i.e. cmake 2.4 doesn't complain, cmake 2.6 works, both versions work as soon as the reduced link interface is the default (soon), if somebody uses this with kdelibs which don't have that anymore he will get the reduced interface instead of errors, so all should be ok) Alex CCMAIL: mueller@kde.org svn path=/trunk/KDE/kdebase/workspace/; revision=836131 --- lib/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6f0ad37ef6..1ab7e7b412 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -16,11 +16,10 @@ target_link_libraries(kdecorations ${KDE4_KDEUI_LIBS}) set_target_properties(kdecorations PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} + ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${KDE4_KDEUI_LIBS};" ) install(TARGETS kdecorations ${INSTALL_TARGETS_DEFAULT_ARGS} ) -_kde4_target_link_interface_libraries(kdecorations "${KDE4_KDEUI_LIBS};") - ########### install files ############### install( FILES @@ -48,12 +47,13 @@ install(TARGETS kwineffects ${INSTALL_TARGETS_DEFAULT_ARGS}) if(OPENGL_FOUND) target_link_libraries(kwineffects ${OPENGL_gl_LIBRARY}) + set_target_properties(kwineffects PROPERTIES + ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${OPENGL_gl_LIBRARY};") # -ldl used by OpenGL code find_library(DL_LIBRARY dl) if (DL_LIBRARY) target_link_libraries(kwineffects ${DL_LIBRARY}) endif(DL_LIBRARY) - _kde4_target_link_interface_libraries(kwineffects "${OPENGL_gl_LIBRARY};") endif(OPENGL_FOUND) if (X11_Xrender_FOUND) target_link_libraries(kwineffects ${X11_Xrender_LIB})