diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-04-26 12:09:00 +0100 | 
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-04-26 12:09:00 +0100 | 
| commit | 376fe10aeaba4402aac0e93ed36897f3a97b6578 (patch) | |
| tree | 94c4057fe224091836cd9ffb88a92ff36889b5d7 | |
| parent | 4d5e809148e32501f40000064a06c7c9b0824fd3 (diff) | |
| download | kconfig-376fe10aeaba4402aac0e93ed36897f3a97b6578.tar.gz kconfig-376fe10aeaba4402aac0e93ed36897f3a97b6578.tar.bz2 | |
Use KF5_INCLUDE_INSTALL_DIR and KF5_INSTALL_TARGETS_DEFAULT_ARGS
This is instead of INCLUDE_INSTALL_DIR and INSTALL_TARGETS_DEFAULT_ARGS,
which will lose the "KF5" suffix from the include path.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/kconfig_compiler/CMakeLists.txt | 2 | 
4 files changed, 8 insertions, 8 deletions
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a0d8a45..4e78026c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ install(EXPORT KF5ConfigTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}"  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h -        DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) +        DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel )  feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 0b1136bc..9d0cdc79 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -24,7 +24,7 @@ target_compile_definitions(KF5ConfigCore          KCONF_UPDATE_INSTALL_LOCATION="${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/$<TARGET_FILE_NAME:KF5::kconf_update>"  ) -target_include_directories(KF5ConfigCore INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KConfigCore>") +target_include_directories(KF5ConfigCore INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KConfigCore>")  target_link_libraries(KF5ConfigCore PUBLIC Qt5::Core)  if(WIN32) @@ -52,12 +52,12 @@ ecm_generate_headers(KConfigCore_HEADERS    REQUIRED_HEADERS KConfigCore_HEADERS  ) -install(TARGETS KF5ConfigCore EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KF5ConfigCore EXPORT KF5ConfigTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})  install(FILES    ${CMAKE_CURRENT_BINARY_DIR}/kconfigcore_export.h    ${KConfigCore_HEADERS} -  DESTINATION ${INCLUDE_INSTALL_DIR}/KConfigCore COMPONENT Devel +  DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KConfigCore COMPONENT Devel  )  include(ECMGeneratePriFile) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index ad0ff16a..af77733d 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(KF5ConfigGui ${libkconfiggui_SRCS})  generate_export_header(KF5ConfigGui BASE_NAME KConfigGui)  add_library(KF5::ConfigGui ALIAS KF5ConfigGui) -target_include_directories(KF5ConfigGui INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KConfigGui>") +target_include_directories(KF5ConfigGui INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KConfigGui>")  target_link_libraries(KF5ConfigGui PUBLIC Qt5::Gui Qt5::Xml KF5::ConfigCore) @@ -35,12 +35,12 @@ ecm_generate_headers(KConfigGui_HEADERS     REQUIRED_HEADERS KConfigGui_HEADERS  ) -install(TARGETS KF5ConfigGui EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KF5ConfigGui EXPORT KF5ConfigTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})  install(FILES    ${CMAKE_CURRENT_BINARY_DIR}/kconfiggui_export.h    ${KConfigGui_HEADERS} -  DESTINATION ${INCLUDE_INSTALL_DIR}/KConfigGui COMPONENT Devel +  DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KConfigGui COMPONENT Devel  )  include(ECMGeneratePriFile) diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt index 24bced26..ec4a7335 100644 --- a/src/kconfig_compiler/CMakeLists.txt +++ b/src/kconfig_compiler/CMakeLists.txt @@ -13,4 +13,4 @@ find_package(Qt5Xml 5.2.0 REQUIRED NO_MODULE)  target_link_libraries(kconfig_compiler Qt5::Xml) -install(TARGETS kconfig_compiler EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kconfig_compiler EXPORT KF5ConfigTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) | 
