From 13842198fafb7c43083fcb7eacb6c3682f54e1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 25 Jul 2020 09:09:15 +0200 Subject: [PATCH] Disable HTTP for targets that don't need it (#12375) --- test/testpaint/CMakeLists.txt | 2 +- test/tests/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/testpaint/CMakeLists.txt b/test/testpaint/CMakeLists.txt index 07af487a67..75da3b1fec 100644 --- a/test/testpaint/CMakeLists.txt +++ b/test/testpaint/CMakeLists.txt @@ -99,5 +99,5 @@ if (FORCE32) else () set(TESTPAINT_64BIT_FLAGS "-Wno-int-to-pointer-cast -fpermissive -Wno-error") endif () -set_target_properties(testpaint PROPERTIES COMPILE_FLAGS "-DNO_VEHICLES -D__TESTPAINT__ -Wno-unused ${TESTPAINT_64BIT_FLAGS}") +set_target_properties(testpaint PROPERTIES COMPILE_FLAGS "-DNO_VEHICLES -D__TESTPAINT__ -Wno-unused ${TESTPAINT_64BIT_FLAGS} -DDISABLE_HTTP") add_dependencies(testpaint segfiles) diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt index 894faaaae4..bbba5a79a0 100644 --- a/test/tests/CMakeLists.txt +++ b/test/tests/CMakeLists.txt @@ -86,6 +86,7 @@ set(COMMON_TEST_SOURCES # Create a re-usable library to save some compilation time add_library(test-common STATIC ${COMMON_TEST_SOURCES}) +set_target_properties(test-common PROPERTIES COMPILE_DEFINITIONS DISABLE_HTTP) # Setup testdata. It should be fine here, as the only way to reach here is by explicitly requesting tests. execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_LIST_DIR}/testdata" "${CMAKE_CURRENT_BINARY_DIR}/testdata")