mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
84c49e758c
Diff: https://github.com/dpaulat/supercell-wx/compare/v0.4.9-release...v0.5.3-release Changelog: https://github.com/dpaulat/supercell-wx/releases/tag/v0.5.3-release Co-authored-by: aware70 <7832566+aware70@users.noreply.github.com>
28 lines
884 B
Diff
28 lines
884 B
Diff
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
|
|
index 648b6578..3f1d8070 100644
|
|
--- a/scwx-qt/scwx-qt.cmake
|
|
+++ b/scwx-qt/scwx-qt.cmake
|
|
@@ -18,7 +18,7 @@ find_package(Fontconfig)
|
|
find_package(geographiclib)
|
|
find_package(geos)
|
|
find_package(glm)
|
|
-find_package(OpenGL)
|
|
+find_package(OpenGL REQUIRED)
|
|
find_package(Python COMPONENTS Interpreter)
|
|
find_package(SQLite3)
|
|
|
|
@@ -759,12 +759,7 @@ if (LINUX)
|
|
target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient)
|
|
endif()
|
|
|
|
-if (LINUX)
|
|
- find_package(mesa-glu REQUIRED)
|
|
- target_link_libraries(scwx-qt PUBLIC mesa-glu::mesa-glu)
|
|
-else()
|
|
- target_link_libraries(scwx-qt PUBLIC OpenGL::GLU)
|
|
-endif()
|
|
+target_link_libraries(scwx-qt PUBLIC OpenGL::GLU)
|
|
|
|
target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
|
Qt${QT_VERSION_MAJOR}::OpenGLWidgets
|