From c61df3e92947592a99c71da121356eb1600fb161 Mon Sep 17 00:00:00 2001 From: Matthew Dawson Date: Wed, 7 May 2014 10:43:36 -0700 Subject: Generate MOC files for kconfig_compiler outputs in tests. The MOC files for generated output from kconfig_compiler are not automatically generated. Re-add the code that does this, fixing the build. I'm assuming this isn't an issue on Windows, as I don't have any machines to test on. Please let me know if this isn't the case. CC: arichardson.kde@gmail.com --- autotests/kconfig_compiler/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autotests/kconfig_compiler/CMakeLists.txt b/autotests/kconfig_compiler/CMakeLists.txt index b2049dc1..73e89bd2 100644 --- a/autotests/kconfig_compiler/CMakeLists.txt +++ b/autotests/kconfig_compiler/CMakeLists.txt @@ -23,6 +23,10 @@ macro(GEN_KCFG_TEST_SOURCE _testName _srcs) 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(${KCFG_OUTPUT_DIR}/${_testName}.h ${KCFG_OUTPUT_DIR}/${_testName}.moc ) + # do not run automoc on the generated file + set_source_files_properties(${KCFG_OUTPUT_DIR}/${_testName}.cpp PROPERTIES SKIP_AUTOMOC TRUE) + set( ${_srcs} ${${_srcs}} ${KCFG_OUTPUT_DIR}/${_testName}.cpp) set_property(SOURCE ${KCFG_OUTPUT_DIR}/${_testName}.cpp APPEND PROPERTY OBJECT_DEPENDS ${KCFG_OUTPUT_DIR}/${_testName}.moc ) endmacro(GEN_KCFG_TEST_SOURCE) -- cgit v1.2.1