commit e011a3223a9771905e16a99c5c7f0db1ab08e9dc Author: David Edmundson Date: Tue Aug 20 11:53:40 2019 +0100 asdf diff --git a/CMakeLists.txt b/CMakeLists.txt index f2aecf1..c7f4dba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(QT_MIN_VERSION "5.5.0") set(KF5_MIN_VERSION "5.58.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(KDEInstallDirs) include(KDECMakeSettings) @@ -58,6 +58,20 @@ ecm_setup_version(${PROJECT_VERSION} SOVERSION 7 ) +find_package(Libcap) +set_package_properties(Libcap PROPERTIES + TYPE OPTIONAL + PURPOSE "Needed for setcap executable" +) +set(HAVE_LIBCAP ${Libcap_FOUND}) + +find_package(libpcap) +set_package_properties( + libpcap PROPERTIES + TYPE RECOMMENDED + PURPOSE "libpcap is used for per-application network usage." +) + find_package(X11) set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" URL "http://www.x.org" @@ -81,11 +95,15 @@ configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysg add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_USE_QSTRINGBUILDER) -add_definitions(-DQT_NO_CAST_FROM_ASCII) -add_definitions(-DQT_NO_CAST_TO_ASCII) +# add_definitions(-DQT_NO_CAST_FROM_ASCII) +# add_definitions(-DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) #add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + add_subdirectory( lsofui ) add_subdirectory( processcore ) add_subdirectory( processui ) @@ -94,6 +112,9 @@ if (KF5Plasma_FOUND) endif() add_subdirectory( ksgrd ) +add_subdirectory( processplugins ) + + if(BUILD_TESTING) add_subdirectory( tests ) endif()