Attachment #1159 for bug #1199

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1199
Collapse All | Expand All




include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${DBUS_INCLUDE_DIRS}
)

link_directories(
  ${DBUS_LIBRARY_DIRS}
)

##### kdm (executable) ##########################

    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_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
  DESTINATION ${BIN_INSTALL_DIR}
)




  ${CMAKE_SOURCE_DIR}/kdmlib
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${DBUS_INCLUDE_DIRS}
  ${HAL_INCLUDE_DIRS}
)

link_directories(
  ${TQT_LIBRARY_DIRS}
  ${DBUS_LIBRARY_DIRS}
)



    main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
    legacy.cpp startup.cpp shutdown.cpp client.cpp
    KSMServerInterface.skel server.skel timed.ui
  LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_LIBRARIES}
)




  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${HAL_INCLUDE_DIRS}
  ${DBUS_INCLUDE_DIRS}
)

link_directories(
  ${TQT_LIBRARY_DIRS}
  ${DBUS_LIBRARY_DIRS}
)




  tde_add_kpart( ${target} AUTOMOC
    SOURCES ${${target}_SRCS}
    LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_LIBRARIES} -ldbus-qt-1
    DESTINATION ${PLUGIN_INSTALL_DIR}
  )
else( )




endif( )


# dbus-tqt (kdm, ksmserver, kioslaves(media))
if( BUILD_KDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )
  # check for dbus-tqt
  pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
  tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
  set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
  set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
  check_cxx_source_compiles("
    #include <tqt.h>
    #include <dbus/connection.h>
    int main(int, char**) { return 0; } "
    HAVE_DBUS_QT3_07 )
  tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
  if( NOT HAVE_DBUS_QT3_07 )
    tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
  endif( )

endif( )

Return to bug 1199

Lines 14-24 Link Here

(-)kdebase/kdm/backend/CMakeLists.txt.ORI (-3 / +3 lines)
14	include_directories(	14	include_directories(
15	${CMAKE_CURRENT_BINARY_DIR}	15	${CMAKE_CURRENT_BINARY_DIR}
16	${CMAKE_BINARY_DIR}	16	${CMAKE_BINARY_DIR}
17	${DBUS_TQT_INCLUDE_DIRS}	17	${DBUS_INCLUDE_DIRS}
18	)	18	)
19		19
20	link_directories(	20	link_directories(
21	${DBUS_TQT_LIBRARY_DIRS}	21	${DBUS_LIBRARY_DIRS}
22	)	22	)
23		23
24	##### kdm (executable) ##########################	24	##### kdm (executable) ##########################
Lines 43-48 Link Here
43	process.c protodpy.c reset.c resource.c rpcauth.c	43	process.c protodpy.c reset.c resource.c rpcauth.c
44	server.c session.c sessreg.c socket.c streams.c	44	server.c session.c sessreg.c socket.c streams.c
45	util.c xdmauth.c xdmcp.c	45	util.c xdmauth.c xdmcp.c
46	LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}	46	LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
47	DESTINATION ${BIN_INSTALL_DIR}	47	DESTINATION ${BIN_INSTALL_DIR}
48	)	48	)

Lines 19-31 Link Here

(-)kdebase/ksmserver/CMakeLists.txt.ORI (-3 / +3 lines)
19	${CMAKE_SOURCE_DIR}/kdmlib	19	${CMAKE_SOURCE_DIR}/kdmlib
20	${TDE_INCLUDE_DIR}	20	${TDE_INCLUDE_DIR}
21	${TQT_INCLUDE_DIRS}	21	${TQT_INCLUDE_DIRS}
22	${DBUS_TQT_INCLUDE_DIRS}	22	${DBUS_INCLUDE_DIRS}
23	${HAL_INCLUDE_DIRS}	23	${HAL_INCLUDE_DIRS}
24	)	24	)
25		25
26	link_directories(	26	link_directories(
27	${TQT_LIBRARY_DIRS}	27	${TQT_LIBRARY_DIRS}
28	${DBUS_TQT_LIBRARY_DIRS}	28	${DBUS_LIBRARY_DIRS}
29	)	29	)
30		30
31		31
Lines 43-47 Link Here
43	main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp	43	main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
44	legacy.cpp startup.cpp shutdown.cpp client.cpp	44	legacy.cpp startup.cpp shutdown.cpp client.cpp
45	KSMServerInterface.skel server.skel timed.ui	45	KSMServerInterface.skel server.skel timed.ui
46	LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}	46	LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_LIBRARIES}
47	)	47	)

Lines 20-31 Link Here

(-)kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI (-3 / +3 lines)
20	${TDE_INCLUDE_DIR}	20	${TDE_INCLUDE_DIR}
21	${TQT_INCLUDE_DIRS}	21	${TQT_INCLUDE_DIRS}
22	${HAL_INCLUDE_DIRS}	22	${HAL_INCLUDE_DIRS}
23	${DBUS_TQT_INCLUDE_DIRS}	23	${DBUS_INCLUDE_DIRS}
24	)	24	)
25		25
26	link_directories(	26	link_directories(
27	${TQT_LIBRARY_DIRS}	27	${TQT_LIBRARY_DIRS}
28	${DBUS_TQT_LIBRARY_DIRS}	28	${DBUS_LIBRARY_DIRS}
29	)	29	)
30		30
31		31
Lines 48-54 Link Here
48		48
49	tde_add_kpart( ${target} AUTOMOC	49	tde_add_kpart( ${target} AUTOMOC
50	SOURCES ${${target}_SRCS}	50	SOURCES ${${target}_SRCS}
51	LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}	51	LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_LIBRARIES} -ldbus-qt-1
52	DESTINATION ${PLUGIN_INSTALL_DIR}	52	DESTINATION ${PLUGIN_INSTALL_DIR}
53	)	53	)
54	else( )	54	else( )

Lines 256-276 Link Here

(-)trinity-tdebase-3.5.13.2/ConfigureChecks.cmake.ORI (-18 lines)
256	endif( )	256	endif( )
257		257
258		258
259	# dbus-tqt (kdm, ksmserver, kioslaves(media))
260	if( BUILD_KDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )
261	# check for dbus-tqt
262	pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
263	tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
264	set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
265	set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
266	check_cxx_source_compiles("
267	#include <tqt.h>
268	#include <dbus/connection.h>
269	int main(int, char**) { return 0; } "
270	HAVE_DBUS_QT3_07 )
271	tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
272	if( NOT HAVE_DBUS_QT3_07 )
273	tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
274	endif( )
275
276	endif( )