From 0c1ed551cadba2d167d02d039696a275b5050f1d Mon Sep 17 00:00:00 2001 From: Leonardo Grasso Date: Mon, 24 Aug 2020 14:19:35 +0200 Subject: [PATCH] build: remove civetweb when minimal build Signed-off-by: Leonardo Grasso --- CMakeLists.txt | 2 ++ tests/CMakeLists.txt | 33 ++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 333f22af..f40c8f5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,6 +199,7 @@ ExternalProject_Add( BUILD_BYPRODUCTS ${TBB_LIB} INSTALL_COMMAND "") +if(NOT MINIMAL_BUILD) # civetweb set(CIVETWEB_SRC "${PROJECT_BINARY_DIR}/civetweb-prefix/src/civetweb/") set(CIVETWEB_LIB "${CIVETWEB_SRC}/install/lib/libcivetweb.a") @@ -213,6 +214,7 @@ ExternalProject_Add( BUILD_IN_SOURCE 1 BUILD_COMMAND ${CMD_MAKE} COPT="-DNO_FILES" WITH_CPP=1 INSTALL_COMMAND ${CMD_MAKE} COPT="-DNO_FILES" install-lib install-headers PREFIX=${CIVETWEB_SRC}/install "WITH_CPP=1") +endif() #string-view-lite include(DownloadStringViewLite) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index de0da2cf..dfb87fb8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,7 +14,11 @@ # License for the specific language governing permissions and limitations under # the License. # -set(FALCO_TESTS_SOURCES test_base.cpp engine/test_token_bucket.cpp engine/test_rulesets.cpp engine/test_falco_utils.cpp falco/test_webserver.cpp) +if(MINIMAL_BUILD) + set(FALCO_TESTS_SOURCES test_base.cpp engine/test_token_bucket.cpp engine/test_rulesets.cpp engine/test_falco_utils.cpp) +else() + set(FALCO_TESTS_SOURCES test_base.cpp engine/test_token_bucket.cpp engine/test_rulesets.cpp engine/test_falco_utils.cpp falco/test_webserver.cpp) +endif() set(FALCO_TESTED_LIBRARIES falco_engine) @@ -35,14 +39,25 @@ if(FALCO_BUILD_TESTS) add_executable(falco_test ${FALCO_TESTS_SOURCES}) target_link_libraries(falco_test PUBLIC ${FALCO_TESTED_LIBRARIES}) - target_include_directories( - falco_test - PUBLIC "${CATCH2_INCLUDE}" - "${FAKEIT_INCLUDE}" - "${PROJECT_SOURCE_DIR}/userspace/engine" - "${YAMLCPP_INCLUDE_DIR}" - "${CIVETWEB_INCLUDE_DIR}" - "${PROJECT_SOURCE_DIR}/userspace/falco") + + if(MINIMAL_BUILD) + target_include_directories( + falco_test + PUBLIC "${CATCH2_INCLUDE}" + "${FAKEIT_INCLUDE}" + "${PROJECT_SOURCE_DIR}/userspace/engine" + "${YAMLCPP_INCLUDE_DIR}" + "${PROJECT_SOURCE_DIR}/userspace/falco") + else() + target_include_directories( + falco_test + PUBLIC "${CATCH2_INCLUDE}" + "${FAKEIT_INCLUDE}" + "${PROJECT_SOURCE_DIR}/userspace/engine" + "${YAMLCPP_INCLUDE_DIR}" + "${CIVETWEB_INCLUDE_DIR}" + "${PROJECT_SOURCE_DIR}/userspace/falco") + endif() add_dependencies(falco_test catch2) include(CMakeParseArguments)