From a882d614ab4500955adb4aa184776c33a06d6a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 18 May 2015 15:20:45 +0200 Subject: Fix flatbuffers generator for tests --- CMakeLists.txt | 4 ++-- tests/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45a6ef5..bd4a229 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,8 +31,8 @@ function(generate_flatbuffers _target) ) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h PROPERTIES GENERATED 1) string(REGEX REPLACE "/" "_" target_name ${fbs}) - add_custom_target(generate_bindings${target_name} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h) - add_dependencies(${_target} generate_bindings${target_name}) + add_custom_target(${_target}-generate_bindings${target_name} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h) + add_dependencies(${_target} ${_target}-generate_bindings${target_name}) endforeach(fbs) endfunction(generate_flatbuffers) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7b97264..35b3996 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,11 +8,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../examples/ ) -generate_flatbuffers(calendar) - macro(manual_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) + generate_flatbuffers(${_testname} calendar) qt5_use_modules(${_testname} Core Test Concurrent) target_link_libraries(${_testname} akonadi2common libhawd) endforeach(_testname) @@ -21,6 +20,7 @@ endmacro(manual_tests) macro(auto_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) + generate_flatbuffers(${_testname} calendar) add_test(${_testname} ${_testname}) qt5_use_modules(${_testname} Core Test Concurrent) target_link_libraries(${_testname} akonadi2common libhawd) -- cgit v1.2.3