diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mason-dependencies.cmake | 7 | ||||
| -rw-r--r-- | cmake/test.cmake | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake index 6ead583936..4553301a55 100644 --- a/cmake/mason-dependencies.cmake +++ b/cmake/mason-dependencies.cmake @@ -21,7 +21,6 @@ mason_use(vector-tile VERSION 1.0.1 HEADER_ONLY) if(MBGL_PLATFORM STREQUAL "android") mason_use(jni.hpp VERSION 3.0.0 HEADER_ONLY) mason_use(sqlite VERSION 3.14.2) - mason_use(gtest VERSION 1.8.0) mason_use(icu VERSION 58.1-min-size) elseif(MBGL_PLATFORM STREQUAL "ios") mason_use(icu VERSION 58.1-min-size) @@ -32,7 +31,6 @@ elseif(MBGL_PLATFORM STREQUAL "linux") mason_use(libpng VERSION 1.6.25) mason_use(libjpeg-turbo VERSION 1.5.0) mason_use(webp VERSION 0.5.1) - mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX}) mason_use(benchmark VERSION 1.2.0) mason_use(icu VERSION 58.1-min-size) mason_use(args VERSION 6.2.0 HEADER_ONLY) @@ -42,7 +40,6 @@ elseif(MBGL_PLATFORM STREQUAL "linux") endif() elseif(MBGL_PLATFORM STREQUAL "macos") mason_use(glfw VERSION 2018-06-27-0be4f3f) - mason_use(gtest VERSION 1.8.0) mason_use(benchmark VERSION 1.2.0) mason_use(icu VERSION 58.1-min-size) mason_use(args VERSION 6.2.0 HEADER_ONLY) @@ -59,8 +56,4 @@ elseif(MBGL_PLATFORM STREQUAL "qt") if(NOT WITH_QT_I18N) mason_use(icu VERSION 58.1-min-size) endif() - - if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX}) - endif() endif() diff --git a/cmake/test.cmake b/cmake/test.cmake index c13ad866c9..f4309896b8 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -1,3 +1,5 @@ +add_vendor_target(gtest STATIC) + if (MBGL_TEST_TARGET_TYPE STREQUAL "library") add_library(mbgl-test SHARED ${MBGL_TEST_FILES} @@ -24,13 +26,13 @@ target_include_directories(mbgl-test target_link_libraries(mbgl-test PRIVATE mbgl-core + PRIVATE gtest ) target_add_mason_package(mbgl-test PRIVATE geometry) target_add_mason_package(mbgl-test PRIVATE variant) target_add_mason_package(mbgl-test PRIVATE unique_resource) target_add_mason_package(mbgl-test PRIVATE rapidjson) -target_add_mason_package(mbgl-test PRIVATE gtest) target_add_mason_package(mbgl-test PRIVATE pixelmatch) target_add_mason_package(mbgl-test PRIVATE boost) target_add_mason_package(mbgl-test PRIVATE geojson) |