diff options
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | 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) | |||
31 | ) | 31 | ) |
32 | set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h PROPERTIES GENERATED 1) | 32 | set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h PROPERTIES GENERATED 1) |
33 | string(REGEX REPLACE "/" "_" target_name ${fbs}) | 33 | string(REGEX REPLACE "/" "_" target_name ${fbs}) |
34 | add_custom_target(generate_bindings${target_name} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h) | 34 | add_custom_target(${_target}-generate_bindings${target_name} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h) |
35 | add_dependencies(${_target} generate_bindings${target_name}) | 35 | add_dependencies(${_target} ${_target}-generate_bindings${target_name}) |
36 | endforeach(fbs) | 36 | endforeach(fbs) |
37 | endfunction(generate_flatbuffers) | 37 | endfunction(generate_flatbuffers) |
38 | 38 | ||
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( | |||
8 | ${CMAKE_CURRENT_SOURCE_DIR}/../examples/ | 8 | ${CMAKE_CURRENT_SOURCE_DIR}/../examples/ |
9 | ) | 9 | ) |
10 | 10 | ||
11 | generate_flatbuffers(calendar) | ||
12 | |||
13 | macro(manual_tests) | 11 | macro(manual_tests) |
14 | foreach(_testname ${ARGN}) | 12 | foreach(_testname ${ARGN}) |
15 | add_executable(${_testname} ${_testname}.cpp) | 13 | add_executable(${_testname} ${_testname}.cpp) |
14 | generate_flatbuffers(${_testname} calendar) | ||
16 | qt5_use_modules(${_testname} Core Test Concurrent) | 15 | qt5_use_modules(${_testname} Core Test Concurrent) |
17 | target_link_libraries(${_testname} akonadi2common libhawd) | 16 | target_link_libraries(${_testname} akonadi2common libhawd) |
18 | endforeach(_testname) | 17 | endforeach(_testname) |
@@ -21,6 +20,7 @@ endmacro(manual_tests) | |||
21 | macro(auto_tests) | 20 | macro(auto_tests) |
22 | foreach(_testname ${ARGN}) | 21 | foreach(_testname ${ARGN}) |
23 | add_executable(${_testname} ${_testname}.cpp) | 22 | add_executable(${_testname} ${_testname}.cpp) |
23 | generate_flatbuffers(${_testname} calendar) | ||
24 | add_test(${_testname} ${_testname}) | 24 | add_test(${_testname} ${_testname}) |
25 | qt5_use_modules(${_testname} Core Test Concurrent) | 25 | qt5_use_modules(${_testname} Core Test Concurrent) |
26 | target_link_libraries(${_testname} akonadi2common libhawd) | 26 | target_link_libraries(${_testname} akonadi2common libhawd) |