Attachment #1404 for bug #1594

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 1594
Collapse All | Expand All




  set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
endif()

if( WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR
    WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT )
  list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} )
  list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )
  list( APPEND TDEHW_CUSTOM_LIBRARIES ${DBUS_TQT_LIBRARIES} )
endif( )

if( WITH_UPOWER )
  add_definitions( -DWITH_UPOWER )
  set ( TDEUPOWER_INCLUDE_DIRECTORIES
    ${DBUS_TQT_INCLUDE_DIRS}
  )
  set ( TDEUPOWER_LIBRARIES
    ${DBUS_TQT_LIBRARIES}
  )
endif( )

if( WITH_UDISKS )


if( WITH_NETWORK_MANAGER_BACKEND )
  add_subdirectory( networkbackends/network-manager/dbus )
  list( APPEND TDEHW_CUSTOM_INCLUDE_DIR 
    ${DBUS_TQT_INCLUDE_DIRS}
    ${NM_UTIL_INCLUDE_DIRS}
    "${CMAKE_CURRENT_BINARY_DIR}/networkbackends/network-manager/dbus"
  )
  list( APPEND TDEHW_CUSTOM_LIBRARIES
    tdenm_dbus-static
    ${DBUS_TQT_LIBRARIES}
  )
  set ( TDENM_BACKEND_SOURCES networkbackends/network-manager/network-manager.cpp )
endif( WITH_NETWORK_MANAGER_BACKEND )

  ${LIBART_INCLUDE_DIRS}
  ${LIBIDN_INCLUDE_DIRS}
  ${GAMIN_INCLUDEDIR}
  ${TDEHW_CUSTOM_INCLUDE_DIRS}
  ${TDEUPOWER_INCLUDE_DIRECTORIES}
)

link_directories(
  ${TQT_LIBRARY_DIRS}
  ${LIBIDN_LIBRARY_DIRS}
  ${GAMIN_LIBDIR}
  ${TDEHW_CUSTOM_LIBRARY_DIRS}
)

##### headers ###################################

  SOURCES ${${target}_SRCS}
  VERSION 4.2.0
  EMBED tdecorenetwork-static
  LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
    ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES}
    ${TDEHW_CUSTOM_LIBRARIES}
  DEPENDENCIES dcopidl dcopidl2cpp
  DESTINATION ${LIB_INSTALL_DIR}
)

Lines 68-74 Link Here

(-)a/tdecore/tdehardwaredevices.cpp (-1 / +1 lines)
68	#endif // WITH_NETWORK_MANAGER_BACKEND	68	#endif // WITH_NETWORK_MANAGER_BACKEND
69		69
70	// uPower and uDisks2 integration	70	// uPower and uDisks2 integration
71	#if defined(WITH_UPOWER) \|\| defined(WITH_UDISKS) \|\| defined(WITH_UDISKS2)	71	#if defined(WITH_UPOWER) \|\| defined(WITH_UDISKS) \|\| defined(WITH_UDISKS2) \|\| defined(WITH_CONSOLEKIT)
72	#include <tqdbusdata.h>	72	#include <tqdbusdata.h>
73	#include <tqdbusmessage.h>	73	#include <tqdbusmessage.h>
74	#include <tqdbusproxy.h>	74	#include <tqdbusproxy.h>

Return to bug 1594

Lines 19-32 if( NOT DBUS_SYSTEM_BUS ) Link Here

(-)a/tdecore/CMakeLists.txt (-14 / +15 lines)
19	set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )	19	set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
20	endif()	20	endif()
21		21
		22	if( WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR
		23	WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT )
		24	list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} )
		25	list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )
		26	list( APPEND TDEHW_CUSTOM_LIBRARIES ${DBUS_TQT_LIBRARIES} )
		27	endif( )
		28
22	if( WITH_UPOWER )	29	if( WITH_UPOWER )
23	add_definitions( -DWITH_UPOWER )	30	add_definitions( -DWITH_UPOWER )
24	set ( TDEUPOWER_INCLUDE_DIRECTORIES
25	${DBUS_TQT_INCLUDE_DIRS}
26	)
27	set ( TDEUPOWER_LIBRARIES
28	${DBUS_TQT_LIBRARIES}
29	)
30	endif( )	31	endif( )
31		32
32	if( WITH_UDISKS )	33	if( WITH_UDISKS )
Lines 48-61 endif( WITH_LIBART ) Link Here
48		49
49	if( WITH_NETWORK_MANAGER_BACKEND )	50	if( WITH_NETWORK_MANAGER_BACKEND )
50	add_subdirectory( networkbackends/network-manager/dbus )	51	add_subdirectory( networkbackends/network-manager/dbus )
51	set ( TDENM_INCLUDE_DIRECTORIES	52	list( APPEND TDEHW_CUSTOM_INCLUDE_DIR
52	${DBUS_TQT_INCLUDE_DIRS}
53	${NM_UTIL_INCLUDE_DIRS}	53	${NM_UTIL_INCLUDE_DIRS}
54	"${CMAKE_BINARY_DIR}/tdecore/networkbackends/network-manager/dbus"	54	"${CMAKE_CURRENT_BINARY_DIR}/networkbackends/network-manager/dbus"
55	)	55	)
56	set ( TDENM_LIBRARIES	56	list( APPEND TDEHW_CUSTOM_LIBRARIES
57	tdenm_dbus-static	57	tdenm_dbus-static
58	${DBUS_TQT_LIBRARIES}
59	)	58	)
60	set ( TDENM_BACKEND_SOURCES networkbackends/network-manager/network-manager.cpp )	59	set ( TDENM_BACKEND_SOURCES networkbackends/network-manager/network-manager.cpp )
61	endif( WITH_NETWORK_MANAGER_BACKEND )	60	endif( WITH_NETWORK_MANAGER_BACKEND )
Lines 75-88 include_directories( Link Here
75	${LIBART_INCLUDE_DIRS}	74	${LIBART_INCLUDE_DIRS}
76	${LIBIDN_INCLUDE_DIRS}	75	${LIBIDN_INCLUDE_DIRS}
77	${GAMIN_INCLUDEDIR}	76	${GAMIN_INCLUDEDIR}
78	${TDENM_INCLUDE_DIRECTORIES}	77	${TDEHW_CUSTOM_INCLUDE_DIRS}
79	${TDEUPOWER_INCLUDE_DIRECTORIES}
80	)	78	)
81		79
82	link_directories(	80	link_directories(
83	${TQT_LIBRARY_DIRS}	81	${TQT_LIBRARY_DIRS}
84	${LIBIDN_LIBRARY_DIRS}	82	${LIBIDN_LIBRARY_DIRS}
85	${GAMIN_LIBDIR}	83	${GAMIN_LIBDIR}
		84	${TDEHW_CUSTOM_LIBRARY_DIRS}
86	)	85	)
87		86
88	##### headers ###################################	87	##### headers ###################################
Lines 177-183 tde_add_library( ${target} SHARED AUTOMOC Link Here
177	SOURCES ${${target}_SRCS}	176	SOURCES ${${target}_SRCS}
178	VERSION 4.2.0	177	VERSION 4.2.0
179	EMBED tdecorenetwork-static	178	EMBED tdecorenetwork-static
180	LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES}	179	LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
		180	${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES}
		181	${TDEHW_CUSTOM_LIBRARIES}
181	DEPENDENCIES dcopidl dcopidl2cpp	182	DEPENDENCIES dcopidl dcopidl2cpp
182	DESTINATION ${LIB_INSTALL_DIR}	183	DESTINATION ${LIB_INSTALL_DIR}
183	)	184	)