diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2020-03-27 10:02:12 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2020-03-27 10:02:12 +0200 |
| commit | 842dd8c177a909817a65ce83b6d55e82a9e2732b (patch) | |
| tree | 68b3e440e78c6f0dd57430b5e33fa5a64308d71f | |
| parent | 77466d23d6b2f524c104373d546ac458035b0ec0 (diff) | |
| download | qtlocation-mapboxgl-upstream/mapbox-base-cheap-ruler-cpp.tar.gz | |
[build] Use cheap-ruler-cpp provided via mapbox-baseupstream/mapbox-base-cheap-ruler-cpp
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | platform/glfw/CMakeLists.txt | 4 | ||||
| m--------- | vendor/cheap-ruler-cpp | 0 | ||||
| -rw-r--r-- | vendor/cheap-ruler-cpp.cmake | 12 |
4 files changed, 1 insertions, 18 deletions
diff --git a/.gitmodules b/.gitmodules index 22a5f02379..017e42d9a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,9 +34,6 @@ [submodule "vendor/benchmark"] path = vendor/benchmark url = https://github.com/google/benchmark.git -[submodule "vendor/cheap-ruler-cpp"] - path = vendor/cheap-ruler-cpp - url = https://github.com/mapbox/cheap-ruler-cpp.git [submodule "vendor/glfw"] path = vendor/glfw url = https://github.com/glfw/glfw.git diff --git a/platform/glfw/CMakeLists.txt b/platform/glfw/CMakeLists.txt index dd7fd306a0..2a1524e115 100644 --- a/platform/glfw/CMakeLists.txt +++ b/platform/glfw/CMakeLists.txt @@ -28,8 +28,6 @@ target_include_directories( PRIVATE ${PROJECT_SOURCE_DIR}/src ) -include(${PROJECT_SOURCE_DIR}/vendor/cheap-ruler-cpp.cmake) - # Use target_link_directories when we move away from CMake 3.10. target_link_libraries( mbgl-glfw @@ -45,7 +43,7 @@ target_link_libraries( Mapbox::Base::Extras::rapidjson Mapbox::Map mbgl-compiler-options - mbgl-vendor-cheap-ruler-cpp + Mapbox::Base::cheap-ruler-cpp ) if(MBGL_WITH_OPENGL) diff --git a/vendor/cheap-ruler-cpp b/vendor/cheap-ruler-cpp deleted file mode 160000 -Subproject 98cbe70dab74c5b77f139013ea5b3623d3ba3dc diff --git a/vendor/cheap-ruler-cpp.cmake b/vendor/cheap-ruler-cpp.cmake deleted file mode 100644 index 7fa21eb69e..0000000000 --- a/vendor/cheap-ruler-cpp.cmake +++ /dev/null @@ -1,12 +0,0 @@ -if(TARGET mbgl-vendor-cheap-ruler-cpp) - return() -endif() - -add_library( - mbgl-vendor-cheap-ruler-cpp INTERFACE -) - -target_include_directories( - mbgl-vendor-cheap-ruler-cpp SYSTEM - INTERFACE ${CMAKE_CURRENT_LIST_DIR}/cheap-ruler-cpp/include -) |