From 83d02c95a1edfc69f303d838f904dc142bdb2f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 5 Nov 2019 15:30:28 +0100 Subject: cmake: Avoid double generating of dcop/tests files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- dcop/tests/CMakeLists.txt | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'dcop') diff --git a/dcop/tests/CMakeLists.txt b/dcop/tests/CMakeLists.txt index 1eb0c4227..164947e9b 100644 --- a/dcop/tests/CMakeLists.txt +++ b/dcop/tests/CMakeLists.txt @@ -30,24 +30,12 @@ tde_add_check_executable( dcop_test AUTOMOC DEPENDENCIES dcop_tests_generated ) -set_property( - SOURCE test.cpp - APPEND PROPERTY - OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test_skel.cpp -) - tde_add_check_executable( driver AUTOMOC SOURCES driver.cpp ${CMAKE_CURRENT_BINARY_DIR}/test.stub LINK tdecore-shared DEPENDENCIES dcop_tests_generated ) -set_property( - SOURCE driver.cpp - APPEND PROPERTY - OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test_stub.cpp -) - add_test( NAME "dcop/dcop-tests" COMMAND sh -x "${CMAKE_CURRENT_SOURCE_DIR}/run-tests.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) @@ -55,9 +43,14 @@ add_test( NAME "dcop/dcop-tests" set_tests_properties( dcop/dcop-tests PROPERTIES TIMEOUT 30) -##### test.h and files ########################## +##### generated files ########################### -add_custom_target( dcop_tests_generated DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test.h ) +add_custom_target( dcop_tests_generated + DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/test.h + ${CMAKE_CURRENT_BINARY_DIR}/test_skel.cpp + ${CMAKE_CURRENT_BINARY_DIR}/test_stub.cpp +) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test.h ${CMAKE_CURRENT_BINARY_DIR}/shell.generated -- cgit v1.2.3