aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2014-02-16 12:53:37 +0100
committerDavid Faure <faure@kde.org>2014-02-16 12:53:37 +0100
commitb2366e9e0ad68fdf56569602fab17df877cc0c6f (patch)
tree96f102a600977c9e0e1012da0fe231423ceadb0d
parentb1487f0c6b4ea64ae9c1ce96348fce8b5f0828df (diff)
downloadkconfig-b2366e9e0ad68fdf56569602fab17df877cc0c6f.tar.gz
kconfig-b2366e9e0ad68fdf56569602fab17df877cc0c6f.tar.bz2
Use the new syntax for ecm_generate_headers()
-rw-r--r--src/core/CMakeLists.txt5
-rw-r--r--src/gui/CMakeLists.txt6
2 files changed, 5 insertions, 6 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f9f71bcd..4e13ee5a 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -31,7 +31,8 @@ set_target_properties(KF5ConfigCore PROPERTIES VERSION ${KCONFIG_VERSION_STRIN
EXPORT_NAME ConfigCore
)
-ecm_generate_headers(
+ecm_generate_headers(KConfigCore_HEADERS
+ HEADER_NAMES
KAuthorized
KConfig
KConfigBackend
@@ -43,10 +44,8 @@ ecm_generate_headers(
KEMailSettings
ConversionCheck
- MODULE_NAME KConfigCore
REQUIRED_HEADERS KConfigCore_HEADERS
)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KConfigCore DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
install(TARGETS KF5ConfigCore EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 75d13fa0..05fe3a25 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -24,16 +24,16 @@ set_target_properties(KF5ConfigGui PROPERTIES VERSION ${KCONFIG_VERSION_STRING
EXPORT_NAME ConfigGui
)
-ecm_generate_headers(
+ecm_generate_headers(KConfigGui_HEADERS
+ HEADER_NAMES
KConfigGui
KConfigLoader
KConfigSkeleton
KStandardShortcut
KWindowConfig
- MODULE_NAME KConfigGui REQUIRED_HEADERS KConfigGui_HEADERS
+ REQUIRED_HEADERS KConfigGui_HEADERS
)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KConfigGui DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
install(TARGETS KF5ConfigGui EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS})