From 980a8b2f88adedcb08e1ee8776b623339f131889 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 5 Feb 2020 14:30:37 +0000 Subject: [PATCH] ksysguard: rework build system to fix LTO build gets rid of the toolchain plugins support requirement to handle static libraries Signed-off-by: Ivailo Monev --- ksysguard/ksysguardd/CMakeLists.txt | 58 ++++++++------------- ksysguard/ksysguardd/FreeBSD/CMakeLists.txt | 14 ----- ksysguard/ksysguardd/FreeBSD/FreeBSD.cmake | 13 +++++ ksysguard/ksysguardd/GNU/CMakeLists.txt | 5 -- ksysguard/ksysguardd/GNU/dummy.cpp | 1 - ksysguard/ksysguardd/Irix/CMakeLists.txt | 9 ---- ksysguard/ksysguardd/Irix/Irix.cmake | 7 +++ ksysguard/ksysguardd/Linux/CMakeLists.txt | 34 ------------ ksysguard/ksysguardd/Linux/Linux.cmake | 30 +++++++++++ ksysguard/ksysguardd/NetBSD/CMakeLists.txt | 11 ---- ksysguard/ksysguardd/NetBSD/NetBSD.cmake | 12 +++++ ksysguard/ksysguardd/OpenBSD/CMakeLists.txt | 13 ++--- ksysguard/ksysguardd/Solaris/CMakeLists.txt | 13 ----- ksysguard/ksysguardd/Solaris/Solaris.cmake | 14 +++++ ksysguard/ksysguardd/Tru64/CMakeLists.txt | 7 --- ksysguard/ksysguardd/Tru64/Tru64.cmake | 5 ++ 16 files changed, 109 insertions(+), 137 deletions(-) delete mode 100644 ksysguard/ksysguardd/FreeBSD/CMakeLists.txt create mode 100644 ksysguard/ksysguardd/FreeBSD/FreeBSD.cmake delete mode 100644 ksysguard/ksysguardd/GNU/CMakeLists.txt delete mode 100644 ksysguard/ksysguardd/GNU/dummy.cpp delete mode 100644 ksysguard/ksysguardd/Irix/CMakeLists.txt create mode 100644 ksysguard/ksysguardd/Irix/Irix.cmake delete mode 100644 ksysguard/ksysguardd/Linux/CMakeLists.txt create mode 100644 ksysguard/ksysguardd/Linux/Linux.cmake delete mode 100644 ksysguard/ksysguardd/NetBSD/CMakeLists.txt create mode 100644 ksysguard/ksysguardd/NetBSD/NetBSD.cmake delete mode 100644 ksysguard/ksysguardd/Solaris/CMakeLists.txt create mode 100644 ksysguard/ksysguardd/Solaris/Solaris.cmake delete mode 100644 ksysguard/ksysguardd/Tru64/CMakeLists.txt create mode 100644 ksysguard/ksysguardd/Tru64/Tru64.cmake diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt index 586c97e0..91e05725 100644 --- a/ksysguard/ksysguardd/CMakeLists.txt +++ b/ksysguard/ksysguardd/CMakeLists.txt @@ -20,49 +20,37 @@ macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H) configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h) -if( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" ) - add_subdirectory( "FreeBSD" ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD ) -else( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" ) -if( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ) - add_subdirectory( "FreeBSD" ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD ) -else( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ) - if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) - add_subdirectory( "Solaris" ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Solaris ) - else( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) - add_subdirectory( ${CMAKE_SYSTEM_NAME} ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SYSTEM_NAME} ) - endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) -endif( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ) -endif( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" ) +if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD) + include(${CMAKE_SYSTEM_NAME}/FreeBSD.cmake) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Solaris) + include(${CMAKE_SYSTEM_NAME}/Solaris.cmake) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "(Irix|Linux|NetBSD|OpenBSD|Tru64)") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SYSTEM_NAME}) + include(${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_NAME}.cmake) +else() + message(FATAL_ERROR "ksysguardd does not support: ${CMAKE_SYSTEM_NAME}") +endif() ########### next target ############### - set(libccont_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/CContLib/ccont.c ) +set(ksysguardd_SRCS + CContLib/ccont.c + Command.c + conf.c + ksysguardd.c + PWUIDCache.c + ${LIBKSYSGUARDD_SOURCES} +) - set(ksysguardd_SRCS ${libccont_SRCS} - Command.c - conf.c - ksysguardd.c - PWUIDCache.c ) +add_executable(ksysguardd ${ksysguardd_SRCS}) - add_executable(ksysguardd ${ksysguardd_SRCS}) +target_link_libraries(ksysguardd ${LIBKSYSGUARDD_LIBS}) - target_link_libraries(ksysguardd libksysguardd) - -if( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" ) - message(STATUS "Adding kvm library on NetBSD") - target_link_libraries(ksysguardd kvm) -endif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" ) if( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ) message(STATUS "Adding kinfo library on DragonFly BSD") target_link_libraries(ksysguardd kinfo) -endif( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ) -if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) - target_link_libraries(ksysguardd socket nsl) -endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) +endif() install(TARGETS ksysguardd ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/ksysguard/ksysguardd/FreeBSD/CMakeLists.txt b/ksysguard/ksysguardd/FreeBSD/CMakeLists.txt deleted file mode 100644 index c68fb9f2..00000000 --- a/ksysguard/ksysguardd/FreeBSD/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib ${CMAKE_CURRENT_SOURCE_DIR}/../ ) - -ADD_LIBRARY(libksysguardd STATIC - acpi.c - apm.c - cpuinfo.c - diskstat.c - loadavg.c - logfile.c - Memory.c - netdev.c - ProcessList.c - stat.c - uptime.c) diff --git a/ksysguard/ksysguardd/FreeBSD/FreeBSD.cmake b/ksysguard/ksysguardd/FreeBSD/FreeBSD.cmake new file mode 100644 index 00000000..6ca18fa3 --- /dev/null +++ b/ksysguard/ksysguardd/FreeBSD/FreeBSD.cmake @@ -0,0 +1,13 @@ +SET(LIBKSYSGUARDD_SOURCES + FreeBSD/acpi.c + FreeBSD/apm.c + FreeBSD/cpuinfo.c + FreeBSD/diskstat.c + FreeBSD/loadavg.c + FreeBSD/logfile.c + FreeBSD/Memory.c + FreeBSD/netdev.c + FreeBSD/ProcessList.c + FreeBSD/stat.c + FreeBSD/uptime.c +) diff --git a/ksysguard/ksysguardd/GNU/CMakeLists.txt b/ksysguard/ksysguardd/GNU/CMakeLists.txt deleted file mode 100644 index 71f6b9ad..00000000 --- a/ksysguard/ksysguardd/GNU/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../CContLib ${CMAKE_CURRENT_SOURCE_DIR}/../) - -ADD_LIBRARY(libksysguardd STATIC - dummy.cpp) - diff --git a/ksysguard/ksysguardd/GNU/dummy.cpp b/ksysguard/ksysguardd/GNU/dummy.cpp deleted file mode 100644 index cc7c6cf4..00000000 --- a/ksysguard/ksysguardd/GNU/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -static const int _ksg_dummy = 0; diff --git a/ksysguard/ksysguardd/Irix/CMakeLists.txt b/ksysguard/ksysguardd/Irix/CMakeLists.txt deleted file mode 100644 index 47c71faa..00000000 --- a/ksysguard/ksysguardd/Irix/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib ${CMAKE_CURRENT_SOURCE_DIR}/../ ) - -ADD_LIBRARY(libksysguardd STATIC - cpu.c - LoadAvg.c - Memory.c - NetDev.c - ProcessList.c) - diff --git a/ksysguard/ksysguardd/Irix/Irix.cmake b/ksysguard/ksysguardd/Irix/Irix.cmake new file mode 100644 index 00000000..70ce749b --- /dev/null +++ b/ksysguard/ksysguardd/Irix/Irix.cmake @@ -0,0 +1,7 @@ +SET(LIBKSYSGUARDD_SOURCES + Irix/cpu.c + Irix/LoadAvg.c + Irix/Memory.c + Irix/NetDev.c + Irix/ProcessList.c +) diff --git a/ksysguard/ksysguardd/Linux/CMakeLists.txt b/ksysguard/ksysguardd/Linux/CMakeLists.txt deleted file mode 100644 index 1dfbf513..00000000 --- a/ksysguard/ksysguardd/Linux/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - -SET(LIBKSYSGUARDD_FILES - acpi.c - apm.c - cpuinfo.c - diskstat.c - diskstats.c - i8k.c - loadavg.c - logfile.c - Memory.c - netdev.c - netstat.c - ProcessList.c - stat.c - softraid.c - uptime.c) - -if(SENSORS_FOUND) - SET(LIBKSYSGUARDD_FILES ${LIBKSYSGUARDD_FILES} lmsensors.c) -endif(SENSORS_FOUND) - -if(EXISTS /proc/i8k) - ADD_DEFINITIONS(-DHAVE_I8K_SUPPORT) -ENDIF(EXISTS /proc/i8k) - - -ADD_LIBRARY(libksysguardd STATIC - ${LIBKSYSGUARDD_FILES}) -if(SENSORS_FOUND) - TARGET_LINK_LIBRARIES(libksysguardd ${SENSORS_LIBRARIES}) -endif(SENSORS_FOUND) - diff --git a/ksysguard/ksysguardd/Linux/Linux.cmake b/ksysguard/ksysguardd/Linux/Linux.cmake new file mode 100644 index 00000000..72f3104f --- /dev/null +++ b/ksysguard/ksysguardd/Linux/Linux.cmake @@ -0,0 +1,30 @@ +SET(LIBKSYSGUARDD_SOURCES + Linux/acpi.c + Linux/apm.c + Linux/cpuinfo.c + Linux/diskstat.c + Linux/diskstats.c + Linux/i8k.c + Linux/loadavg.c + Linux/logfile.c + Linux/Memory.c + Linux/netdev.c + Linux/netstat.c + Linux/ProcessList.c + Linux/stat.c + Linux/softraid.c + Linux/uptime.c +) + +if(SENSORS_FOUND) + SET(LIBKSYSGUARDD_SOURCES ${LIBKSYSGUARDD_SOURCES} Linux/lmsensors.c) +endif(SENSORS_FOUND) + +if(EXISTS /proc/i8k) + ADD_DEFINITIONS(-DHAVE_I8K_SUPPORT) +ENDIF(EXISTS /proc/i8k) + +if(SENSORS_FOUND) + SET(LIBKSYSGUARDD_LIBS ${SENSORS_LIBRARIES}) +endif(SENSORS_FOUND) + diff --git a/ksysguard/ksysguardd/NetBSD/CMakeLists.txt b/ksysguard/ksysguardd/NetBSD/CMakeLists.txt deleted file mode 100644 index 67bbb9cc..00000000 --- a/ksysguard/ksysguardd/NetBSD/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib ${CMAKE_CURRENT_SOURCE_DIR}/../ ) - -ADD_LIBRARY(libksysguardd STATIC - apm.c - CPU.c - diskstat.c - loadavg.c - logfile.c - Memory.c - netdev.c - ProcessList.c) diff --git a/ksysguard/ksysguardd/NetBSD/NetBSD.cmake b/ksysguard/ksysguardd/NetBSD/NetBSD.cmake new file mode 100644 index 00000000..a2c323f2 --- /dev/null +++ b/ksysguard/ksysguardd/NetBSD/NetBSD.cmake @@ -0,0 +1,12 @@ +SET(LIBKSYSGUARDD_SOURCES + NetBSD/apm.c + NetBSD/CPU.c + NetBSD/diskstat.c + NetBSD/loadavg.c + NetBSD/logfile.c + NetBSD/Memory.c + NetBSD/netdev.c + NetBSD/ProcessList.c +) + +SET(LIBKSYSGUARDD_LIBS kvm) diff --git a/ksysguard/ksysguardd/OpenBSD/CMakeLists.txt b/ksysguard/ksysguardd/OpenBSD/CMakeLists.txt index eba58b14..296b4ae6 100644 --- a/ksysguard/ksysguardd/OpenBSD/CMakeLists.txt +++ b/ksysguard/ksysguardd/OpenBSD/CMakeLists.txt @@ -1,8 +1,5 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib ${CMAKE_CURRENT_SOURCE_DIR}/../ ) - -ADD_LIBRARY(libksysguardd STATIC - cpu.c - memory.c - ProcessList.c) - - +SET(LIBKSYSGUARDD_SOURCES + OpenBSD/cpu.c + OpenBSD/memory.c + OpenBSD/ProcessList.c +) diff --git a/ksysguard/ksysguardd/Solaris/CMakeLists.txt b/ksysguard/ksysguardd/Solaris/CMakeLists.txt deleted file mode 100644 index 9b16d539..00000000 --- a/ksysguard/ksysguardd/Solaris/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib ${CMAKE_CURRENT_SOURCE_DIR}/../ ) - -ADD_LIBRARY(libksysguardd STATIC - LoadAvg.c - Memory.c - NetDev.c - ProcessList.c) - -if(EXISTS /dev/kstat) - ADD_DEFINITIONS(-DHAVE_KSTAT) - FIND_LIBRARY(KSTAT_LIBRARY NAMES kstat) - TARGET_LINK_LIBRARIES(libksysguardd ${KSTAT_LIBRARY}) -ENDIF(EXISTS /dev/kstat) diff --git a/ksysguard/ksysguardd/Solaris/Solaris.cmake b/ksysguard/ksysguardd/Solaris/Solaris.cmake new file mode 100644 index 00000000..9cbacf01 --- /dev/null +++ b/ksysguard/ksysguardd/Solaris/Solaris.cmake @@ -0,0 +1,14 @@ +SET(LIBKSYSGUARDD_SOURCES + Solaris/LoadAvg.c + Solaris/Memory.c + Solaris/NetDev.c + Solaris/ProcessList.c +) + +SET(LIBKSYSGUARDD_LIBS socket nsl) + +if(EXISTS /dev/kstat) + ADD_DEFINITIONS(-DHAVE_KSTAT) + FIND_LIBRARY(KSTAT_LIBRARY NAMES kstat) + SET(LIBKSYSGUARDD_LIBS ${LIBKSYSGUARDD_LIBS} ${KSTAT_LIBRARY}) +ENDIF() diff --git a/ksysguard/ksysguardd/Tru64/CMakeLists.txt b/ksysguard/ksysguardd/Tru64/CMakeLists.txt deleted file mode 100644 index 13821554..00000000 --- a/ksysguard/ksysguardd/Tru64/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib ${CMAKE_CURRENT_SOURCE_DIR}/../ ) - -ADD_LIBRARY(libksysguardd STATIC - LoadAvg.c - Memory.c - NetDev.c) - diff --git a/ksysguard/ksysguardd/Tru64/Tru64.cmake b/ksysguard/ksysguardd/Tru64/Tru64.cmake new file mode 100644 index 00000000..707227b1 --- /dev/null +++ b/ksysguard/ksysguardd/Tru64/Tru64.cmake @@ -0,0 +1,5 @@ +SET(LIBKSYSGUARDD_SOURCES + Tru64/LoadAvg.c + Tru64/Memory.c + Tru64/NetDev.c +)