aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2020-03-24 20:15:56 +0100
committerFriedrich W. H. Kossebau <kossebau@kde.org>2020-03-24 20:47:59 +0100
commit6136a974262684847746c0bdc980163cbe326eaa (patch)
tree7a2db58d6a30b714a8e75817b1bb04b5ebf9ae5e
parent1bd96af44c83d55c287333f52f02a99639d86809 (diff)
downloadextra-cmake-modules-5.69.0.tar.gz
extra-cmake-modules-5.69.0.tar.bz2
ECMPoQmToolsTest: have separate moc files for tr_thread_test 1 & 2v5.69.0-rc1v5.69.0
Reviewers: #frameworks, #build_system, dfaure Reviewed By: dfaure Subscribers: kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D28253
-rw-r--r--tests/ECMPoQmToolsTest/CMakeLists.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/ECMPoQmToolsTest/CMakeLists.txt b/tests/ECMPoQmToolsTest/CMakeLists.txt
index 86954544..64ec6f1c 100644
--- a/tests/ECMPoQmToolsTest/CMakeLists.txt
+++ b/tests/ECMPoQmToolsTest/CMakeLists.txt
@@ -121,14 +121,20 @@ target_link_libraries(tr_thread_test PRIVATE Qt5::Core)
# loading a module on a thread other than the main thread
# (different catalog, no AUTOMOC)
#
-qt5_generate_moc(tr_thread_test.cpp "${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test.moc")
+# make sure the moc file is only visible to this test/target
+set(MOC_DIR "${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test_2_moc")
+qt5_generate_moc(tr_thread_test.cpp "${MOC_DIR}/tr_thread_test.moc")
+# Unset SKIP_AUTOMOC again, to not interfer with AUTOMOC as set for tr_thread_test
+set_source_files_properties(tr_thread_test PROPERTIES SKIP_AUTOMOC OFF)
+
set(tr_thread_test_2_SRCS
tr_thread_test.cpp
- "${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test.moc"
+ "${MOC_DIR}/tr_thread_test.moc"
)
ecm_create_qm_loader(tr_thread_test_2_SRCS catalog2)
add_executable(tr_thread_test_2 ${tr_thread_test_2_SRCS})
-target_include_directories(tr_thread_test_2 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
+set_target_properties(tr_thread_test_2 PROPERTIES AUTOMOC OFF)
+target_include_directories(tr_thread_test_2 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}" "${MOC_DIR}")
target_compile_definitions(tr_thread_test_2 PRIVATE "MODULE_PATH=\"$<TARGET_FILE:tr_thread_module>\"")
target_link_libraries(tr_thread_test_2 PRIVATE Qt5::Core)