diff options
| -rw-r--r-- | KF5ConfigMacros.cmake | 2 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/kconfig_compiler/CMakeLists.txt | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/KF5ConfigMacros.cmake b/KF5ConfigMacros.cmake index bf2615b3..aeebee9e 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 + COMMAND KF5::kconfig_compiler_kf5 ARGS ${_kcfg_FILE} ${_tmp_FILE} -d ${CMAKE_CURRENT_BINARY_DIR}/${_rel_PATH} MAIN_DEPENDENCY ${_tmp_FILE} DEPENDS ${_kcfg_FILE} ${_KDE4_KCONFIG_COMPILER_DEP} ) diff --git a/autotests/kconfig_compiler/CMakeLists.txt b/autotests/kconfig_compiler/CMakeLists.txt index ef2fd407..a2ebb945 100644 --- a/autotests/kconfig_compiler/CMakeLists.txt +++ b/autotests/kconfig_compiler/CMakeLists.txt @@ -1,12 +1,12 @@ -#test5.cpp test5.h: $(srcdir)/test5.kcfg ../kconfig_compiler $(srcdir)/test5.kcfgc -# ../kconfig_compiler $(srcdir)/test5.kcfg $(srcdir)/test5.kcfgc +#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) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h COMMAND ${KConfig_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler_kf5) # 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 31726df1..71f2609d 100644 --- a/src/kconfig_compiler/CMakeLists.txt +++ b/src/kconfig_compiler/CMakeLists.txt @@ -3,13 +3,13 @@ set(kconfig_compiler_SRCS kconfig_compiler.cpp) -add_executable(kconfig_compiler ${kconfig_compiler_SRCS}) -add_executable(KF5::kconfig_compiler ALIAS kconfig_compiler) +add_executable(kconfig_compiler_kf5 ${kconfig_compiler_SRCS}) +add_executable(KF5::kconfig_compiler_kf5 ALIAS kconfig_compiler_kf5) find_package(Qt5Xml 5.2.0 REQUIRED NO_MODULE) -target_link_libraries(kconfig_compiler Qt5::Xml) +target_link_libraries(kconfig_compiler_kf5 Qt5::Xml) # "export" this target too so we can use the LOCATION property of the imported target in # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex -install(TARGETS kconfig_compiler EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS kconfig_compiler_kf5 EXPORT KF5ConfigTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) |