Commit cfaa0a2d authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use non-deprecated KDEInstallDirs variables

parent dddb618f
......@@ -98,9 +98,9 @@ if(BUILD_TESTING)
add_subdirectory( tests )
endif()
install(DIRECTORY scripts/ DESTINATION ${DATA_INSTALL_DIR}/ksysguard/scripts)
install(DIRECTORY scripts/ DESTINATION ${KDE_INSTALL_DATADIR}/ksysguard/scripts)
set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KF5SysGuard)
set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_LIBDIR}/cmake/KF5SysGuard)
configure_package_config_file(KF5SysGuardConfig.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
......
......@@ -18,7 +18,11 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FR
add_library(ksgrd ${ksgrd_LIB_SRCS})
add_library(KF5::SysGuard ALIAS ksgrd)
target_include_directories(ksgrd PUBLIC "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>" "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/ksysguard/>")
target_include_directories(ksgrd
PUBLIC
"$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard/>"
)
target_link_libraries(ksgrd
PUBLIC
......@@ -34,9 +38,17 @@ target_link_libraries(ksgrd
)
set_target_properties(ksgrd PROPERTIES VERSION ${KSYSGUARD_VERSION_STRING} SOVERSION ${KSYSGUARD_SOVERSION} EXPORT_NAME SysGuard)
install(TARGETS ksgrd EXPORT libksysguardLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(FILES SensorAgent.h SensorClient.h SensorManager.h SensorShellAgent.h SensorSocketAgent.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard/ksgrd COMPONENT Devel)
install(TARGETS ksgrd EXPORT libksysguardLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install(FILES
SensorAgent.h
SensorClient.h
SensorManager.h
SensorShellAgent.h
SensorSocketAgent.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/ksysguard/ksgrd
COMPONENT Devel
)
......@@ -19,11 +19,11 @@ target_link_libraries(lsofui
KF5::I18n
)
set_target_properties(lsofui PROPERTIES VERSION ${KSYSGUARD_VERSION_STRING} SOVERSION ${KSYSGUARD_SOVERSION} EXPORT_NAME LsofUi)
install(TARGETS lsofui EXPORT libksysguardLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS lsofui EXPORT libksysguardLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############
install( FILES lsof.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard COMPONENT Devel)
install( FILES lsof.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/ksysguard COMPONENT Devel)
# set(ksysguardlsofwidgets_PART_SRCS
# ${CMAKE_CURRENT_BINARY_DIR}/ksysguardlsofwidgets.cpp
......
......@@ -29,13 +29,22 @@ if( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
target_link_libraries(processcore kvm)
endif()
target_include_directories(processcore PUBLIC "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>" "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/ksysguard>")
target_include_directories(processcore
PUBLIC
"$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard>"
)
set_target_properties(processcore PROPERTIES VERSION ${KSYSGUARD_VERSION_STRING} SOVERSION ${KSYSGUARD_SOVERSION} EXPORT_NAME ProcessCore)
install(TARGETS processcore EXPORT libksysguardLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS processcore EXPORT libksysguardLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
install( FILES processes.h process.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard/processcore COMPONENT Devel)
install( FILES
processes.h
process.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/ksysguard/processcore
COMPONENT Devel
)
#------ KAuth stuff
......
......@@ -48,7 +48,7 @@ target_link_libraries(processui
target_include_directories(processui
PUBLIC
"$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/ksysguard>"
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard>"
)
if(X11_FOUND)
......@@ -69,7 +69,7 @@ set_target_properties(processui
EXPORT_NAME ProcessUi
)
install(TARGETS processui EXPORT libksysguardLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS processui EXPORT libksysguardLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
#----------------------
......@@ -81,5 +81,11 @@ install(TARGETS processui EXPORT libksysguardLibraryTargets ${INSTALL_TARGETS_DE
#
# install(TARGETS ksysguardwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
install( FILES ProcessModel.h ProcessFilter.h KTextEditVT.h ksysguardprocesslist.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard/processui COMPONENT Devel)
install( FILES
ProcessModel.h
ProcessFilter.h
KTextEditVT.h
ksysguardprocesslist.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/ksysguard/processui
COMPONENT Devel
)
......@@ -25,7 +25,7 @@ set_target_properties(ksignalplotter
EXPORT_NAME SignalPlotter
)
install(TARGETS ksignalplotter EXPORT libksysguardLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS ksignalplotter EXPORT libksysguardLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
#----------------------
......@@ -37,4 +37,4 @@ install(TARGETS ksignalplotter EXPORT libksysguardLibraryTargets ${INSTALL_TARGE
#
# install(TARGETS ksignalplotterwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer)
install(FILES ksignalplotter.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard COMPONENT Devel)
install(FILES ksignalplotter.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/ksysguard COMPONENT Devel)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment