diff --git a/CMakeLists.txt b/CMakeLists.txt index 417cd9c..3928a46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,63 +1,59 @@ cmake_minimum_required(VERSION 2.8.12) project(KConfig) find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Xml) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) include(FeatureSummary) include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIG VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigConfigVersion.cmake" 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) # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Config") include(ECMPackageConfigHelpers) ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5ConfigConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigConfigVersion.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/KF5ConfigMacros.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) install(EXPORT KF5ConfigTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5ConfigTargets.cmake NAMESPACE KF5:: COMPONENT Devel) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) endif() diff --git a/KF5ConfigMacros.cmake b/KF5ConfigMacros.cmake index 6bfab0f..936da98 100644 --- a/KF5ConfigMacros.cmake +++ b/KF5ConfigMacros.cmake @@ -1,84 +1,84 @@ # KCONFIG_ADD_KCFG_FILES (SRCS_VAR [GENERATE_MOC] [USE_RELATIVE_PATH] file1.kcfgc ... fileN.kcfgc) # Use this to add KDE config compiler files to your application/library. # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files. # Use optional USE_RELATIVE_PATH to generate the classes in the build following the given # relative path to the file. # # Copyright (c) 2006-2009 Alexander Neundorf, # Copyright (c) 2006, 2007, Laurent Montel, # Copyright (c) 2007 Matthias Kretz # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. macro (KCONFIG_ADD_KCFG_FILES _sources ) foreach (_current_ARG ${ARGN}) if( ${_current_ARG} STREQUAL "GENERATE_MOC" ) set(_kcfg_generatemoc TRUE) endif() if( ${_current_ARG} STREQUAL "USE_RELATIVE_PATH" ) set(_kcfg_relativepath TRUE) endif() endforeach () foreach (_current_FILE ${ARGN}) if(NOT ${_current_FILE} STREQUAL "GENERATE_MOC" AND NOT ${_current_FILE} STREQUAL "USE_RELATIVE_PATH") get_filename_component(_tmp_FILE ${_current_FILE} ABSOLUTE) get_filename_component(_abs_PATH ${_tmp_FILE} PATH) if (_kcfg_relativepath) # Process relative path only if the option was set # Get relative path get_filename_component(_rel_PATH ${_current_FILE} PATH) if (IS_ABSOLUTE ${_rel_PATH}) # We got an absolute path set(_rel_PATH "") endif () endif () get_filename_component(_basename ${_tmp_FILE} NAME_WE) # If we had a relative path and we're asked to use it, then change the basename accordingly if(NOT ${_rel_PATH} STREQUAL "") set(_basename ${_rel_PATH}/${_basename}) endif() file(READ ${_tmp_FILE} _contents) string(REGEX REPLACE "^(.*\n)?File=([^\n]+kcfg).*\n.*$" "\\2" _kcfg_FILENAME "${_contents}") set(_src_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) set(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) set(_moc_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc) set(_kcfg_FILE ${_abs_PATH}/${_kcfg_FILENAME}) # Maybe the .kcfg is a generated file? if(NOT EXISTS "${_kcfg_FILE}") set(_kcfg_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_kcfg_FILENAME}) endif() if(NOT EXISTS "${_kcfg_FILE}") message(ERROR "${_kcfg_FILENAME} not found; tried in ${_abs_PATH} and ${CMAKE_CURRENT_BINARY_DIR}") endif() # make sure the directory exist in the build directory if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${_rel_PATH}") file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_rel_PATH}) endif() # 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}) if(_kcfg_generatemoc) qt5_generate_moc(${_header_FILE} ${_moc_FILE} ) set_source_files_properties(${_src_FILE} PROPERTIES SKIP_AUTOMOC TRUE) # don't run automoc on this file list(APPEND ${_sources} ${_moc_FILE}) endif() list(APPEND ${_sources} ${_src_FILE} ${_header_FILE}) endif(NOT ${_current_FILE} STREQUAL "GENERATE_MOC" AND NOT ${_current_FILE} STREQUAL "USE_RELATIVE_PATH") endforeach (_current_FILE) endmacro (KCONFIG_ADD_KCFG_FILES) diff --git a/autotests/kconfig_compiler/CMakeLists.txt b/autotests/kconfig_compiler/CMakeLists.txt index 289e958..e2e12e3 100644 --- a/autotests/kconfig_compiler/CMakeLists.txt +++ b/autotests/kconfig_compiler/CMakeLists.txt @@ -1,229 +1,226 @@ -#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}) if (NOT _kcfgFile) set(_kcfgFile "${_testName}.kcfg") 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 ) # do not run automoc on the generated file set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp PROPERTIES SKIP_AUTOMOC TRUE) set( ${_srcs} ${${_srcs}} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ) set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) endmacro(GEN_KCFG_TEST_SOURCE) include(ECMMarkAsTest) ########### next target ############### set(test1_SRCS test1main.cpp ) gen_kcfg_test_source(test1 test1_SRCS) add_executable(test1 ${test1_SRCS}) ecm_mark_as_test(test1) target_link_libraries(test1 KF5::ConfigGui) ########### next target ############### set(test2_SRCS test2main.cpp ) gen_kcfg_test_source(test2 test2_SRCS) add_executable(test2 ${test2_SRCS}) ecm_mark_as_test(test2) target_link_libraries(test2 KF5::ConfigGui) ########### next target ############### set(test3_SRCS test3main.cpp ) gen_kcfg_test_source(test3 test3_SRCS) add_executable(test3 ${test3_SRCS}) ecm_mark_as_test(test3) target_link_libraries(test3 KF5::ConfigGui) ########### next target ############### set(test3a_SRCS test3amain.cpp ) gen_kcfg_test_source(test3a test3a_SRCS) add_executable(test3a ${test3a_SRCS}) ecm_mark_as_test(test3a) target_link_libraries(test3a KF5::ConfigGui) ########### next target ############### set(test4_SRCS test4main.cpp ) gen_kcfg_test_source(test4 test4_SRCS) add_executable(test4 ${test4_SRCS}) ecm_mark_as_test(test4) target_link_libraries(test4 KF5::ConfigGui) ########### next target ############### set(test5_SRCS test5main.cpp ) gen_kcfg_test_source(test5 test5_SRCS) add_executable(test5 ${test5_SRCS}) ecm_mark_as_test(test5) target_link_libraries(test5 KF5::ConfigGui) ########### next target ############### set(test6_SRCS test6main.cpp ) gen_kcfg_test_source(test6 test6_SRCS) add_executable(test6 ${test6_SRCS}) ecm_mark_as_test(test6) target_link_libraries(test6 KF5::ConfigGui) ########### next target ############### set(test7_SRCS test7main.cpp ) gen_kcfg_test_source(test7 test7_SRCS) add_executable(test7 ${test7_SRCS}) ecm_mark_as_test(test7) target_link_libraries(test7 KF5::ConfigGui) ########### next target ############### set(test8_SRCS test8main.cpp ) gen_kcfg_test_source(test8a test8_SRCS) gen_kcfg_test_source(test8b test8_SRCS) add_executable(test8 ${test8_SRCS}) ecm_mark_as_test(test8) target_link_libraries(test8 KF5::ConfigGui) ########### next target ############### set(test9_SRCS test9main.cpp ) gen_kcfg_test_source(test9 test9_SRCS) add_executable(test9 ${test9_SRCS}) ecm_mark_as_test(test9) target_link_libraries(test9 KF5::ConfigGui) ########### next target ############### set(test10_SRCS test10main.cpp ) gen_kcfg_test_source(test10 test10_SRCS) add_executable(test10 ${test10_SRCS}) ecm_mark_as_test(test10) target_link_libraries(test10 KF5::ConfigGui) ########### next target ############### set(test11_SRCS test11main.cpp ) gen_kcfg_test_source(test11 test11_SRCS) gen_kcfg_test_source(test11a test11_SRCS) add_executable(test11 ${test11_SRCS}) ecm_mark_as_test(test11) target_link_libraries(test11 KF5::ConfigGui) ########### next target ############### set(test12_SRCS test12main.cpp ) gen_kcfg_test_source(test12 test12_SRCS) add_executable(test12 ${test12_SRCS}) ecm_mark_as_test(test12) target_link_libraries(test12 KF5::ConfigGui) ########### next target ############### set(test_dpointer_SRCS test_dpointer_main.cpp ) gen_kcfg_test_source(test_dpointer test_dpointer_SRCS) add_executable(test_dpointer ${test_dpointer_SRCS}) ecm_mark_as_test(test_dpointer) target_link_libraries(test_dpointer KF5::ConfigGui) ########### next target ############### set(test_signal_SRCS test_signal_main.cpp ) gen_kcfg_test_source(test_signal test_signal_SRCS) add_executable(test_signal ${test_signal_SRCS}) ecm_mark_as_test(test_signal) target_link_libraries(test_signal KF5::ConfigGui) ########### next target ############### set(kconfigcompiler_test_signals_SRCS kconfigcompiler_test_signals.cpp) gen_kcfg_test_source(signals_test_singleton kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg) gen_kcfg_test_source(signals_test_no_singleton kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg) gen_kcfg_test_source(signals_test_singleton_dpointer kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg) gen_kcfg_test_source(signals_test_no_singleton_dpointer kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg) add_executable(kconfigcompiler_test_signals ${kconfigcompiler_test_signals_SRCS}) ecm_mark_as_test(kconfigcompiler_test_signals) target_link_libraries(kconfigcompiler_test_signals Qt5::Test KF5::ConfigGui) add_test(kconfig-kconfigcompiler-signals kconfigcompiler_test_signals) ########### next target ############### set(kconfigcompiler_test_SRCS kconfigcompiler_test.cpp ) add_executable(kconfigcompiler_test ${kconfigcompiler_test_SRCS}) ecm_mark_as_test(kconfigcompiler_test) add_test(kconfig-kconfigcompiler kconfigcompiler_test) target_link_libraries(kconfigcompiler_test Qt5::Test ) ########### install files ############### diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt index 1fbb482..24bced2 100644 --- a/src/kconfig_compiler/CMakeLists.txt +++ b/src/kconfig_compiler/CMakeLists.txt @@ -1,13 +1,16 @@ 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})