diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-02-14 00:33:22 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-23 21:12:32 +0200 |
| commit | 6bf00d86b7868e8b5aa01da26958a47f06a28a8e (patch) | |
| tree | c4f9b3e19aeaf956cfc8f338497e463868c7d95a | |
| parent | 3e173e1b7190b0becb95e8689bccffb1704b697a (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-httplib.tar.gz | |
[test] Include cpp-httplib as a system libraryupstream/tmpsantos-httplib
This way it will not get warnings by linters and -Werror.
| -rw-r--r-- | test/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | vendor/cpp-httplib.cmake | 12 |
2 files changed, 14 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 ) diff --git a/vendor/cpp-httplib.cmake b/vendor/cpp-httplib.cmake new file mode 100644 index 0000000000..204dbabbb3 --- /dev/null +++ b/vendor/cpp-httplib.cmake @@ -0,0 +1,12 @@ +if(TARGET mbgl-vendor-cpp-httplib) + return() +endif() + +add_library( + mbgl-vendor-cpp-httplib INTERFACE +) + +target_include_directories( + mbgl-vendor-cpp-httplib SYSTEM + INTERFACE ${CMAKE_CURRENT_LIST_DIR}/cpp-httplib +) |