Browse Source

Add lm_sensors optional support for ksysguard

tags/r14.0.0
Alexander Golubev 7 years ago
committed by Slávek Banko
parent
commit
84d73a40b2
5 changed files with 30 additions and 3 deletions
  1. +2
    -0
      CMakeLists.txt
  2. +0
    -2
      ksysguard/CMakeLists.txt
  3. +3
    -1
      ksysguard/ksysguardd/CMakeLists.txt
  4. +21
    -0
      ksysguard/ksysguardd/ConfigureChecks.cmake
  5. +4
    -0
      ksysguard/ksysguardd/Linux/CMakeLists.txt

+ 2
- 0
CMakeLists.txt View File

@@ -81,6 +81,7 @@ option( WITH_XDMCP "xdmcp support for tdm" ${WITH_ALL_OPTIONS} )
option( WITH_XINERAMA "Enable xinerama extension support" ${WITH_ALL_OPTIONS} )
option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} )
option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} )
option( WITH_SENSORS "Enable lm_sensors support (ksysguard)" ${WITH_ALL_OPTIONS} )
option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
@@ -112,6 +113,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
# WITH_XINERAMA affects ksplashml
# WITH_ARTS affects libkonq khotkeys
# WITH_I8K affects ksysguard
# WITH_SENSORS affects ksysguard
# WITH_HAL affects tdeioslaves(media) ksmserver
# WITH_TDEHWLIB affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
# WITH_LIBRAW1394 affects kcontrol(view1394)


+ 0
- 2
ksysguard/CMakeLists.txt View File

@@ -9,8 +9,6 @@
#
#################################################

# FIXME no support for lm_sensors yet

add_subdirectory( CContLib )
add_subdirectory( ksysguardd )
add_subdirectory( gui )


+ 3
- 1
ksysguard/ksysguardd/CMakeLists.txt View File

@@ -11,13 +11,14 @@

# FIXME there is only Linux support

include( ConfigureChecks.cmake )

if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
set( OS_SPECIFIC_DIR Linux )
else()
tde_message_fatal( "Your operating system (${CMAKE_SYSTEM_NAME}) is not supported yet." )
endif()


add_subdirectory( ${OS_SPECIFIC_DIR} )


@@ -39,5 +40,6 @@ include_directories(
tde_add_executable( ksysguardd AUTOMOC
SOURCES Command.c conf.c ksysguardd.c PWUIDCache.c
LINK ccont-static ksysguardd-static ${TDE_LIB_DIR}/libtdefakes_nonpic.a
${SENSORS_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)

+ 21
- 0
ksysguard/ksysguardd/ConfigureChecks.cmake View File

@@ -0,0 +1,21 @@
#################################################
#
# (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 )

+ 4
- 0
ksysguard/ksysguardd/Linux/CMakeLists.txt View File

@@ -15,6 +15,10 @@ if( WITH_I8K )
add_definitions( -DHAVE_I8K_SUPPORT )
endif()

if( WITH_SENSORS )
add_definitions( -DHAVE_SENSORS_SENSORS_H )
endif()

include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/ksysguard/CContLib


Loading…
Cancel
Save