From 6c249038163b670ae30af484587c29ca2e3a2997 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Mon, 17 Apr 2023 20:01:51 -0500 Subject: [PATCH] Updating build for GCC/Linux --- external/mapbox-gl-native.cmake | 1 + scwx-qt/scwx-qt.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/external/mapbox-gl-native.cmake b/external/mapbox-gl-native.cmake index b27a3661..910a6849 100644 --- a/external/mapbox-gl-native.cmake +++ b/external/mapbox-gl-native.cmake @@ -3,6 +3,7 @@ set(PROJECT_NAME scwx-mbgl) set(gtest_disable_pthreads ON) set(MBGL_WITH_QT ON) +set(MBGL_QT_WITH_INTERNAL_ICU ON) add_subdirectory(mapbox-gl-native) find_package(ZLIB) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index d6e3a615..fe097017 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -373,7 +373,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets Boost::json Boost::timer qmaplibregl - opengl32 + $<$:opengl32> freetype-gl GeographicLib::GeographicLib glm::glm