summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-02-14 00:33:22 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-23 23:04:51 +0200
commit1adc436c9d883663b2d6fb0cb9014043fa7bc2b6 (patch)
treec4f9b3e19aeaf956cfc8f338497e463868c7d95a /test
parent3e173e1b7190b0becb95e8689bccffb1704b697a (diff)
downloadqtlocation-mapboxgl-1adc436c9d883663b2d6fb0cb9014043fa7bc2b6.tar.gz
[test] Include cpp-httplib as a system library
This way it will not get warnings by linters and -Werror.
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0248582c61..2ed92eb987 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -156,10 +156,6 @@ else()
COMPILE_OPTIONS
$<$<STREQUAL:${CMAKE_SYSTEM_NAME},iOS>:-Wno-shorten-64-to-32>
)
- target_include_directories(
- mbgl-test
- PRIVATE ${PROJECT_SOURCE_DIR}/vendor/cpp-httplib
- )
endif()
if(NOT DEFINED ENV{CI})
@@ -187,6 +183,7 @@ target_include_directories(
PUBLIC ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/test/include
)
+include(${PROJECT_SOURCE_DIR}/vendor/cpp-httplib.cmake)
include(${PROJECT_SOURCE_DIR}/vendor/googletest.cmake)
if(CMAKE_SYSTEM_NAME STREQUAL iOS)
@@ -211,6 +208,7 @@ target_link_libraries(
Mapbox::Base::Extras::args
Mapbox::Base::pixelmatch-cpp
mbgl-compiler-options
+ mbgl-vendor-cpp-httplib
PUBLIC mbgl-core
)