diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-03-23 14:38:14 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-03-24 11:49:49 +0000 |
| commit | 892e693f616297a91835d3d79353926b96bd1201 (patch) | |
| tree | 1e6ab41eceafae9f65d997cb3b0959e6e66c961f | |
| parent | a9ac60da055e108d153e265190ebd870cecb9f6f (diff) | |
| download | kconfig-892e693f616297a91835d3d79353926b96bd1201.tar.gz kconfig-892e693f616297a91835d3d79353926b96bd1201.tar.bz2 | |
Rename the kconfig_compiler_kf5 target to kconfig_compiler
Just because the executable has the "_kf5" suffix, that does not mean
the target should have it. This is ugly API, and will be unnecessary
porting effort for KF6.
REVIEW: 116995
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | KF5ConfigMacros.cmake | 2 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/kconfig_compiler/CMakeLists.txt | 11 |
4 files changed, 10 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 417cd9cb..3928a462 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,10 +25,6 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIG SOVERSION 5) -# Needed for the tests or examples to build correctly -set(KConfig_KCFGC_EXECUTABLE kconfig_compiler_kf5) -include(KF5ConfigMacros.cmake) - add_subdirectory(src) add_subdirectory(autotests) diff --git a/KF5ConfigMacros.cmake b/KF5ConfigMacros.cmake index 6bfab0f4..936da985 100644 --- a/KF5ConfigMacros.cmake +++ b/KF5ConfigMacros.cmake @@ -66,7 +66,7 @@ macro (KCONFIG_ADD_KCFG_FILES _sources ) # the command for creating the source file from the kcfg file add_custom_command(OUTPUT ${_header_FILE} ${_src_FILE} - COMMAND KF5::kconfig_compiler_kf5 + COMMAND KF5::kconfig_compiler ARGS ${_kcfg_FILE} ${_tmp_FILE} -d ${CMAKE_CURRENT_BINARY_DIR}/${_rel_PATH} MAIN_DEPENDENCY ${_tmp_FILE} DEPENDS ${_kcfg_FILE}) diff --git a/autotests/kconfig_compiler/CMakeLists.txt b/autotests/kconfig_compiler/CMakeLists.txt index 289e9583..e2e12e34 100644 --- a/autotests/kconfig_compiler/CMakeLists.txt +++ b/autotests/kconfig_compiler/CMakeLists.txt @@ -1,7 +1,4 @@ -#test5.cpp test5.h: $(srcdir)/test5.kcfg ../kconfig_compiler_kf5 $(srcdir)/test5.kcfgc -# ../kconfig_compiler_kf5 $(srcdir)/test5.kcfg $(srcdir)/test5.kcfgc - macro(GEN_KCFG_TEST_SOURCE _testName _srcs) cmake_parse_arguments(ARG "" "KCFG" "" ${ARGN} ) set(_kcfgFile ${ARG_KCFG}) @@ -10,8 +7,8 @@ macro(GEN_KCFG_TEST_SOURCE _testName _srcs) endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h - COMMAND ${KConfig_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler_kf5) + COMMAND KF5::kconfig_compiler ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc KF5::kconfig_compiler) # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt5_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt index 1fbb4824..24bced26 100644 --- a/src/kconfig_compiler/CMakeLists.txt +++ b/src/kconfig_compiler/CMakeLists.txt @@ -3,11 +3,14 @@ set(kconfig_compiler_SRCS kconfig_compiler.cpp) -add_executable(kconfig_compiler_kf5 ${kconfig_compiler_SRCS}) -add_executable(KF5::kconfig_compiler_kf5 ALIAS kconfig_compiler_kf5) +add_executable(kconfig_compiler ${kconfig_compiler_SRCS}) +set_target_properties(kconfig_compiler PROPERTIES + OUTPUT_NAME "kconfig_compiler_kf5" +) +add_executable(KF5::kconfig_compiler ALIAS kconfig_compiler) find_package(Qt5Xml 5.2.0 REQUIRED NO_MODULE) -target_link_libraries(kconfig_compiler_kf5 Qt5::Xml) +target_link_libraries(kconfig_compiler Qt5::Xml) -install(TARGETS kconfig_compiler_kf5 EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS kconfig_compiler EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) |