From 6b911cd67fa91a23aa3fe30a1196e4b21ce401af Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 1 Jul 2020 17:33:29 +0200 Subject: [PATCH] cmake: only build FPGA support if libxil is present --- .gitlab-ci.yml | 1 + CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb2cca3f1..e7ff67fa4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,6 +109,7 @@ build:fedora-minimal:x86_64: -DWITH_PLUGINS=OFF -DWITH_CLIENTS=OFF -DWITH_DOC=OFF + -DWITH_FPGA=OFF build:fedora-minimal-default:x86_64: <<: *build diff --git a/CMakeLists.txt b/CMakeLists.txt index 74871f4d9..b58e276e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,6 +109,7 @@ pkg_check_modules(UUID IMPORTED_TARGET REQUIRED uuid>=2.23) pkg_check_modules(CGRAPH IMPORTED_TARGET libcgraph>=2.30) pkg_check_modules(GVC IMPORTED_TARGET libgvc>=2.30) pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg) +pkg_check_modules(XIL IMPORTED_TARGET libxil) if(NOT NANOMSG_FOUND) pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0) endif() @@ -123,7 +124,7 @@ cmake_dependent_option(WITH_WEB "Build with internal webserver" cmake_dependent_option(WITH_API "Build with remote control API" ON "" OFF) cmake_dependent_option(WITH_CONFIG "Build with support for libconfig configuration syntax" ON "LIBCONFIG_FOUND" OFF) cmake_dependent_option(WITH_SRC "Build executables" ON "TOPLEVEL_PROJECT" OFF) -cmake_dependent_option(WITH_FPGA "Build with support for VILLASfpga" ON "" OFF) +cmake_dependent_option(WITH_FPGA "Build with support for VILLASfpga" ON "XIL_FOUND" OFF) cmake_dependent_option(WITH_TOOLS "Build auxilary tools" ON "TOPLEVEL_PROJECT" OFF) cmake_dependent_option(WITH_TESTS "Run tests" ON "TOPLEVEL_PROJECT" OFF) cmake_dependent_option(WITH_PLUGINS "Build plugins" ON "TOPLEVEL_PROJECT" OFF)