From 9076772cf600def6f735e4e2d2d3dc6928e5d153 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 13 Jul 2025 14:31:25 -0500 Subject: [PATCH] Remove GLEW as a dependency (cherry picked from commit 1b404d8b9ff95baaa0d7ee11089e79d6d5e65ff9) --- conanfile.py | 1 - scwx-qt/scwx-qt.cmake | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 908aab88..8ed594d3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -11,7 +11,6 @@ class SupercellWxConan(ConanFile): "freetype/2.13.2", "geographiclib/2.4", "geos/3.13.0", - "glew/2.2.0", "glm/1.0.1", "gtest/1.16.0", "libcurl/8.12.1", diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index e96e828a..e4a392b3 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -17,8 +17,8 @@ find_package(Boost) find_package(Fontconfig) find_package(geographiclib) find_package(geos) -find_package(GLEW) find_package(glm) +find_package(OpenGL) find_package(Python COMPONENTS Interpreter) find_package(SQLite3) @@ -746,9 +746,9 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets GEOS::geos GEOS::geos_cxx_flags glad_gl_core_33 - GLEW::GLEW glm::glm imgui + OpenGL::GLU qt6ct-common qt6ct-widgets SQLite::SQLite3