diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-01 12:36:24 +0300 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-01 13:54:28 +0300 |
| commit | 04309e01ceaa267becef16ed9db6f91fcea91f59 (patch) | |
| tree | e8d5fce7ddef12c7d075f607f083c51f2f1824c5 /cmake | |
| parent | baceb47bff59cbd30c2d1548edd6ec6cc8a9f062 (diff) | |
| download | qtlocation-mapboxgl-04309e01ceaa267becef16ed9db6f91fcea91f59.tar.gz | |
[core] Switch test build to googletest git submodule
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/test.cmake | 4 | ||||
| -rw-r--r-- | cmake/vendor.cmake | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/test.cmake b/cmake/test.cmake index 16dc10f93d..1c1d3269a7 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -1,5 +1,3 @@ -add_vendor_target(gtest STATIC) - # scripts/generate-file-lists.js to change the source files for this target. load_sources_list(MBGL_TEST_FILES test/test-files.json) if (MBGL_TEST_TARGET_TYPE STREQUAL "library") @@ -25,7 +23,7 @@ target_include_directories(mbgl-test ) target_link_libraries(mbgl-test PRIVATE - gtest + googletest args mbgl-core shelf-pack-cpp diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 03e34ccbd9..0b164434c9 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -12,6 +12,7 @@ include(${CMAKE_SOURCE_DIR}/vendor/expected.cmake) include(${CMAKE_SOURCE_DIR}/vendor/filesystem.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson.hpp.cmake) +include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake) include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake) |