alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use KF5_INCLUDE_INSTALL_DIR and KF5_INSTALL_TARGETS_DEFAULT_ARGS

Browse Source 
This is instead of INCLUDE_INSTALL_DIR and INSTALL_TARGETS_DEFAULT_ARGS,
which will lose the "KF5" suffix from the include path.
This commit is contained in:
Alex Merry 2014-04-26 12:14:03 +01:00
parent abee1e2150
commit 2ef3b32dcd
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -136,7 +136,7 @@ ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5PlasmaConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5PlasmaConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
PATH_VARS INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
PATH_VARS KF5_INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
)
install(FILES
@ -154,7 +154,7 @@ install(EXPORT KF5PlasmaTargets
COMPONENT Devel)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel )
# make plasma_version.h available
include_directories(${CMAKE_CURRENT_BINARY_DIR})

2
examples/kpart/CMakeLists.txt
View File

@ -11,7 +11,7 @@ add_executable(plasma-example-kpart-shell ${plasma_example_kpart_shell_SRCS})
target_link_libraries(plasma-example-kpart-shell KF5::Plasma KF5::Parts)
########### install files ###############
install(TARGETS plasma-example-kpart-shell ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS plasma-example-kpart-shell ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} )
install( PROGRAMS plasma-example-kpart-shell.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install(FILES plasma-default-layoutrc DESTINATION ${DATA_INSTALL_DIR}/plasma-example-kpart-shell/)
install( FILES plasma-kpart-shellui.rc DESTINATION ${DATA_INSTALL_DIR}/plasma-example-kpart-shell/ )

10
src/plasma/CMakeLists.txt
View File

@ -135,7 +135,7 @@ target_include_directories(KF5Plasma PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}/Plasma>"
)
target_include_directories(KF5Plasma INTERFACE
"$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR};${INCLUDE_INSTALL_DIR}/Plasma>"
"$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR};${KF5_INCLUDE_INSTALL_DIR}/Plasma>"
)
set_target_properties(KF5Plasma PROPERTIES
@ -176,18 +176,18 @@ install(FILES
${Plasma_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/plasma/plasma_export.h
version.h
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel)
DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel)
install(DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/Plasma
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel)
install(FILES
scripting/appletscript.h
scripting/dataenginescript.h
scripting/scriptengine.h
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/scripting COMPONENT Devel)
DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/plasma/scripting COMPONENT Devel)
install(FILES
data/servicetypes/plasma-applet.desktop
@ -206,5 +206,5 @@ install(FILES data/operations/dataengineservice.operations DESTINATION ${DATA_IN
install(FILES data/operations/plasmoidservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
install(FILES data/operations/storage.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
install(TARGETS KF5Plasma EXPORT KF5PlasmaTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS KF5Plasma EXPORT KF5PlasmaTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})

2
src/plasmapkg/CMakeLists.txt
View File

@ -5,5 +5,5 @@ add_executable(plasmapkg2
target_link_libraries(plasmapkg2 KF5::Plasma KF5::I18n KF5::Service KF5::CoreAddons Qt5::DBus)
install(TARGETS plasmapkg2 ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS plasmapkg2 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})

8
src/plasmaquick/CMakeLists.txt
View File

@ -81,7 +81,7 @@ set_target_properties(KF5PlasmaQuick PROPERTIES
EXPORT_NAME PlasmaQuick
)
install(TARGETS KF5PlasmaQuick EXPORT KF5PlasmaQuickTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS KF5PlasmaQuick EXPORT KF5PlasmaQuickTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
generate_export_header(KF5PlasmaQuick BASE_NAME PlasmaQuick)
@ -95,11 +95,11 @@ set(plasmaquick_LIB_INCLUDES
)
#install(FILES ${plasmaquick_LIB_INCLUDES}
# DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaquick COMPONENT Devel)
# DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/plasmaquick COMPONENT Devel)
#install(DIRECTORY
# includes/PlasmaQuick
# DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
# DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5PlasmaQuick")
@ -107,7 +107,7 @@ ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5PlasmaQuickConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5PlasmaQuickConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
PATH_VARS INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
PATH_VARS KF5_INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
)
install(FILES

2
tests/dpi/CMakeLists.txt
View File

@ -5,5 +5,5 @@ add_executable(dpitest
target_link_libraries(dpitest KF5::Plasma KF5::I18n Qt5::Gui)
install(TARGETS dpitest ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS dpitest ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})

2
tests/kplugins/CMakeLists.txt
View File

@ -5,5 +5,5 @@ add_executable(plugintest
target_link_libraries(plugintest KF5::Plasma KF5::I18n KF5::Service Qt5::DBus)
#install(TARGETS plugintest ${INSTALL_TARGETS_DEFAULT_ARGS})
#install(TARGETS plugintest ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})