Attachment #1507 for bug #1651

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

Lines 9-16 Link Here

(-)a/ksysguard/CMakeLists.txt (-2 lines)
9	#	9	#
10	#################################################	10	#################################################
11		11
12	# FIXME no support for lm_sensors yet
13
14	add_subdirectory( CContLib )	12	add_subdirectory( CContLib )
15	add_subdirectory( ksysguardd )	13	add_subdirectory( ksysguardd )
16	add_subdirectory( gui )	14	add_subdirectory( gui )

Lines 11-23 Link Here

(-)a/ksysguard/ksysguardd/CMakeLists.txt (-1 / +3 lines)
11		11
12	# FIXME there is only Linux support	12	# FIXME there is only Linux support
13		13
		14	include( ConfigureChecks.cmake )
		15
14	if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )	16	if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
15	set( OS_SPECIFIC_DIR Linux )	17	set( OS_SPECIFIC_DIR Linux )
16	else()	18	else()
17	tde_message_fatal( "Your operating system (${CMAKE_SYSTEM_NAME}) is not supported yet." )	19	tde_message_fatal( "Your operating system (${CMAKE_SYSTEM_NAME}) is not supported yet." )
18	endif()	20	endif()
19		21
20
21	add_subdirectory( ${OS_SPECIFIC_DIR} )	22	add_subdirectory( ${OS_SPECIFIC_DIR} )
22		23
23		24
Lines 39-43 include_directories( Link Here
39	tde_add_executable( ksysguardd AUTOMOC	40	tde_add_executable( ksysguardd AUTOMOC
40	SOURCES Command.c conf.c ksysguardd.c PWUIDCache.c	41	SOURCES Command.c conf.c ksysguardd.c PWUIDCache.c
41	LINK ccont-static ksysguardd-static ${TDE_LIB_DIR}/libtdefakes_nonpic.a	42	LINK ccont-static ksysguardd-static ${TDE_LIB_DIR}/libtdefakes_nonpic.a
		43	${SENSORS_LIBRARIES}
42	DESTINATION ${BIN_INSTALL_DIR}	44	DESTINATION ${BIN_INSTALL_DIR}
43	)	45	)




#################################################
#
#  (C) 2013 Alexander Golubev
#  fatzer2 (AT) gmail.com
#
#  Improvements and feedback are welcome
#
#  This file is released under GPL >= 2
#
#################################################

# lm_sensors
if( WITH_SENSORS )
  check_include_file( "sensors/sensors.h" HAVE_SENSORS_SENSORS_H )
  check_library_exists( sensors sensors_init "" HAVE_SENSORS_LIB )
  if( HAVE_SENSORS_SENSORS_H AND HAVE_SENSORS_LIB )
    set( SENSORS_LIBRARIES sensors )
  else( )
    tde_message_fatal( "lm_sensors are required, but not found on your system" )
  endif( )
endif( WITH_SENSORS )

Lines 15-20 if( WITH_I8K ) Link Here

(-)a/ksysguard/ksysguardd/Linux/CMakeLists.txt (-1 / +4 lines)
15	add_definitions( -DHAVE_I8K_SUPPORT )	15	add_definitions( -DHAVE_I8K_SUPPORT )
16	endif()	16	endif()
17		17
		18	if( WITH_SENSORS )
		19	add_definitions( -DHAVE_SENSORS_SENSORS_H )
		20	endif()
		21
18	include_directories(	22	include_directories(
19	${CMAKE_BINARY_DIR}	23	${CMAKE_BINARY_DIR}
20	${CMAKE_SOURCE_DIR}/ksysguard/CContLib	24	${CMAKE_SOURCE_DIR}/ksysguard/CContLib
21	-

Return to bug 1651

Lines 81-86 option( WITH_XDMCP "xdmcp support for tdm" ${WITH_ALL_OPTIONS} ) Link Here

(-)a/CMakeLists.txt (+2 lines)
81	option( WITH_XINERAMA "Enable xinerama extension support" ${WITH_ALL_OPTIONS} )	81	option( WITH_XINERAMA "Enable xinerama extension support" ${WITH_ALL_OPTIONS} )
82	option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} )	82	option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} )
83	option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} )	83	option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} )
		84	option( WITH_SENSORS "Enable lm_sensors support (ksysguard)" ${WITH_ALL_OPTIONS} )
84	option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )	85	option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
85	option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )	86	option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
86	option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )	87	option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
Lines 112-117 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" Link Here
112	# WITH_XINERAMA affects ksplashml	113	# WITH_XINERAMA affects ksplashml
113	# WITH_ARTS affects libkonq khotkeys	114	# WITH_ARTS affects libkonq khotkeys
114	# WITH_I8K affects ksysguard	115	# WITH_I8K affects ksysguard
		116	# WITH_SENSORS affects ksysguard
115	# WITH_HAL affects tdeioslaves(media) ksmserver	117	# WITH_HAL affects tdeioslaves(media) ksmserver
116	# WITH_TDEHWLIB affects tdeioslaves(media), replaces WITH_HAL on systems without HAL	118	# WITH_TDEHWLIB affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
117	# WITH_LIBRAW1394 affects kcontrol(view1394)	119	# WITH_LIBRAW1394 affects kcontrol(view1394)

Line 0 Link Here

(-)a/ksysguard/ksysguardd/ConfigureChecks.cmake (+21 lines)
	1	#################################################
	2	#
	3	# (C) 2013 Alexander Golubev
	4	# fatzer2 (AT) gmail.com
	5	#
	6	# Improvements and feedback are welcome
	7	#
	8	# This file is released under GPL >= 2
	9	#
	10	#################################################
	11
	12	# lm_sensors
	13	if( WITH_SENSORS )
	14	check_include_file( "sensors/sensors.h" HAVE_SENSORS_SENSORS_H )
	15	check_library_exists( sensors sensors_init "" HAVE_SENSORS_LIB )
	16	if( HAVE_SENSORS_SENSORS_H AND HAVE_SENSORS_LIB )
	17	set( SENSORS_LIBRARIES sensors )
	18	else( )
	19	tde_message_fatal( "lm_sensors are required, but not found on your system" )
	20	endif( )
	21	endif( WITH_SENSORS )