From ba9d670d4bbc86007b3e99720b3ac313a357ecb3 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 15 Jun 2020 22:49:19 +0200 Subject: [PATCH] cmake: make unit-tests optional --- fpga/CMakeLists.txt | 6 +++++- fpga/tests/CMakeLists.txt | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fpga/CMakeLists.txt b/fpga/CMakeLists.txt index ab1a1c66f..9fb833e73 100644 --- a/fpga/CMakeLists.txt +++ b/fpga/CMakeLists.txt @@ -57,13 +57,17 @@ pkg_check_modules(JANSSON REQUIRED IMPORTED_TARGET jansson) pkg_check_modules(XIL REQUIRED IMPORTED_TARGET libxil) find_package(Threads) +find_package(Criterion) include_directories(thirdparty/CLI11) include_directories(thirdparty/rang) add_subdirectory(lib) add_subdirectory(src) -add_subdirectory(tests) + +if(CRITERION_FOUND AND TOPLEVEL_PROJECT) + add_subdirectory(tests) +endif() if(NOT CMAKE_PROJECT_NAME STREQUAL "villas-node") add_subdirectory(common) diff --git a/fpga/tests/CMakeLists.txt b/fpga/tests/CMakeLists.txt index 6738b76a0..d43aac4d1 100644 --- a/fpga/tests/CMakeLists.txt +++ b/fpga/tests/CMakeLists.txt @@ -42,8 +42,6 @@ if (CMAKE_CUDA_COMPILER) gpu.cpp rtds2gpu.cpp gpu_kernels.cu) endif () -find_package(Criterion REQUIRED) - target_include_directories(unit-tests-fpga PUBLIC ../include ${CRITERION_INCLUDE_DIRECTORIES}