-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
This commit is contained in:
parent
6546f980e5
commit
9e8a357597
1 changed files with 3 additions and 3 deletions
|
@ -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})
|
||||
|
|
Loading…
Reference in a new issue