diff --git a/.gitmodules b/.gitmodules index c05d6eb3..f1e7fbbd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "external/mapbox-gl-native"] - path = external/mapbox-gl-native - url = https://github.com/dpaulat/maplibre-gl-native.git [submodule "external/cmake-conan"] path = external/cmake-conan url = https://github.com/conan-io/cmake-conan.git diff --git a/external/mapbox-gl-native b/external/mapbox-gl-native deleted file mode 160000 index 3e85454f..00000000 --- a/external/mapbox-gl-native +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3e85454fe5e571e7b235131912bb867ef9d75c3c diff --git a/external/mapbox-gl-native.cmake b/external/mapbox-gl-native.cmake deleted file mode 100644 index 9d8f34bb..00000000 --- a/external/mapbox-gl-native.cmake +++ /dev/null @@ -1,48 +0,0 @@ -cmake_minimum_required(VERSION 3.20) -set(PROJECT_NAME scwx-mbgl) - -set(gtest_disable_pthreads ON) -set(MLN_WITH_QT ON) -set(MLN_QT_WITH_INTERNAL_ICU ON) -add_subdirectory(mapbox-gl-native) - -find_package(ZLIB) -target_include_directories(mbgl-core PRIVATE ${ZLIB_INCLUDE_DIRS}) -target_link_libraries(mbgl-core INTERFACE ${ZLIB_LIBRARIES}) - -if (MSVC) - # Produce PDB file for debug - target_compile_options(mbgl-core PRIVATE "$<$:/Zi>") - target_compile_options(qmaplibregl PRIVATE "$<$:/Zi>") - target_link_options(qmaplibregl PRIVATE "$<$:/DEBUG>") - target_link_options(qmaplibregl PRIVATE "$<$:/OPT:REF>") - target_link_options(qmaplibregl PRIVATE "$<$:/OPT:ICF>") -else() - target_compile_options(mbgl-core PRIVATE "$<$:-g>") - target_compile_options(qmaplibregl PRIVATE "$<$:-g>") -endif() - -set(MBGL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/mapbox-gl-native/include - ${CMAKE_CURRENT_SOURCE_DIR}/mapbox-gl-native/platform/qt/include PARENT_SCOPE) - -set_target_properties(mbgl-qt PROPERTIES EXCLUDE_FROM_ALL True) -set_target_properties(mbgl-test-runner PROPERTIES EXCLUDE_FROM_ALL True) - -set_target_properties(mbgl-benchmark PROPERTIES FOLDER mbgl/exclude) -set_target_properties(mbgl-render-test PROPERTIES FOLDER mbgl/exclude) -set_target_properties(mbgl-test PROPERTIES FOLDER mbgl/exclude) -set_target_properties(mbgl-vendor-benchmark PROPERTIES FOLDER mbgl/exclude) -set_target_properties(mbgl-vendor-googletest PROPERTIES FOLDER mbgl/exclude) -set_target_properties(mbgl-core-license PROPERTIES FOLDER mbgl/exclude) -set_target_properties(mbgl-qt PROPERTIES FOLDER mbgl/exclude) -set_target_properties(mbgl-test-runner PROPERTIES FOLDER mbgl/exclude) - -if (TARGET mbgl-qt-docs) - set_target_properties(mbgl-qt-docs PROPERTIES FOLDER mbgl/exclude) -endif() - -set_target_properties(mbgl-core PROPERTIES FOLDER mbgl) -set_target_properties(mbgl-vendor-csscolorparser PROPERTIES FOLDER mbgl) -set_target_properties(mbgl-vendor-nunicode PROPERTIES FOLDER mbgl) -set_target_properties(mbgl-vendor-parsedate PROPERTIES FOLDER mbgl) -set_target_properties(qmaplibregl PROPERTIES FOLDER mbgl)