From 3e8d5bcf0f9f1f662226d0acddcf129ad8f2b910 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 3 Sep 2011 15:58:51 +0000 Subject: Fix a couple of kdebase build errors on non-Ubuntu platforms git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1251212 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdm/backend/CMakeLists.txt | 8 +++++++- libkonq/CMakeLists.txt | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt index c70353bd6..1beb5c0d8 100644 --- a/kdm/backend/CMakeLists.txt +++ b/kdm/backend/CMakeLists.txt @@ -29,6 +29,12 @@ add_custom_command( OUTPUT config.ci set_property( SOURCE auth.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) +if( WITH_XDMCP ) + set( XDMCP_LIBRARIES " -lXdmcp" ) +else() + set( XDMCP_LIBRARIES "" ) +endif() + tde_add_executable( kdm SOURCES access.c auth.c bootman.c choose.c client.c consolekit.c @@ -37,6 +43,6 @@ tde_add_executable( kdm process.c protodpy.c reset.c resource.c rpcauth.c server.c session.c sessreg.c socket.c streams.c util.c xdmauth.c xdmcp.c - LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${PAM_LIBRARY} + LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt index b96a8caa0..4ced51f33 100644 --- a/libkonq/CMakeLists.txt +++ b/libkonq/CMakeLists.txt @@ -21,6 +21,7 @@ include_directories( ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${ARTS_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR}/arts/ ) link_directories( -- cgit v1.2.3