Add a cmake detection for Xext library

Remove hardcoded Xext flags in tderandr and tdestyles/keramik
Add missing link flag in tdeui
(cherry picked from commit aae8990d33)
v3.5.13-sru
François Andriot 10 years ago committed by Slávek Banko
parent b04a282c62
commit 13fddea637

@ -662,6 +662,12 @@ if( WITH_XCOMPOSITE )
else( WITH_XCOMPOSITE ) else( WITH_XCOMPOSITE )
tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" ) tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" )
endif( XCOMPOSITE_FOUND ) endif( XCOMPOSITE_FOUND )
# xext (krandr, kstyles/keramik, kdeui)
pkg_search_module( XEXT xext )
if( NOT XEXT_FOUND )
tde_message_fatal( "xext is required for xcomposite support, but was not found on your system" )
endif( )
endif( WITH_XCOMPOSITE ) endif( WITH_XCOMPOSITE )

@ -148,7 +148,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 4.2.0 VERSION 4.2.0
LINK kdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} LINK kdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${XEXT_LIBRARIES}
DEPENDENCIES dcopidl DEPENDENCIES dcopidl
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -43,6 +43,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 0.0.95 VERSION 0.0.95
LINK kdeui-shared ${XRANDR_LIBRARIES} Xext LINK kdeui-shared ${XRANDR_LIBRARIES} ${XEXT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -65,6 +65,6 @@ set_source_files_properties( pixmaploader.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdefx-shared Xext LINK kdefx-shared ${XEXT_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
) )

Loading…
Cancel
Save