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>
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
|
index 1039e96e..16f2c84a 100644
|
|
--- a/external/CMakeLists.txt
|
|
+++ b/external/CMakeLists.txt
|
|
@@ -15,7 +15,7 @@ set_property(DIRECTORY
|
|
units.cmake
|
|
qt6ct.cmake)
|
|
|
|
-include(aws-sdk-cpp.cmake)
|
|
+find_package(AWSSDK CONFIG REQUIRED)
|
|
include(date.cmake)
|
|
include(glad.cmake)
|
|
include(hsluv-c.cmake)
|
|
diff --git a/external/stb.cmake b/external/stb.cmake
|
|
index 570af425..f2e7b2c8 100644
|
|
--- a/external/stb.cmake
|
|
+++ b/external/stb.cmake
|
|
@@ -1,4 +1,4 @@
|
|
cmake_minimum_required(VERSION 3.24)
|
|
set(PROJECT_NAME scwx-stb)
|
|
|
|
-set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE)
|
|
+# Nix: set STB_INCLUDE_DIR in cmake flags
|
|
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
|
|
index 4833b9c2..641fc637 100644
|
|
--- a/scwx-qt/scwx-qt.cmake
|
|
+++ b/scwx-qt/scwx-qt.cmake
|
|
@@ -13,14 +13,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
OPTION(SCWX_DISABLE_CONSOLE "Disables the Windows console in release mode" ON)
|
|
|
|
-find_package(Boost)
|
|
+find_package(Boost REQUIRED COMPONENTS json timer atomic)
|
|
find_package(Fontconfig)
|
|
-find_package(geographiclib)
|
|
+find_package(GeographicLib)
|
|
find_package(geos)
|
|
find_package(glm)
|
|
find_package(OpenGL)
|
|
find_package(Python COMPONENTS Interpreter)
|
|
find_package(SQLite3)
|
|
+find_package(PNG)
|
|
|
|
find_package(QT NAMES Qt6
|
|
COMPONENTS Gui
|
|
@@ -789,6 +790,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
|
qt6ct-common
|
|
qt6ct-widgets
|
|
SQLite::SQLite3
|
|
+ PNG::PNG
|
|
wxdata)
|
|
|
|
target_link_libraries(supercell-wx PRIVATE scwx-qt
|
|
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
|
|
index 451efc13..86cbb42b 100644
|
|
--- a/wxdata/wxdata.cmake
|
|
+++ b/wxdata/wxdata.cmake
|
|
@@ -4,7 +4,8 @@ project(scwx-data)
|
|
|
|
include(CheckCXXSymbolExists)
|
|
|
|
-find_package(Boost)
|
|
+find_package(Boost REQUIRED COMPONENTS iostreams)
|
|
+find_package(BZip2)
|
|
find_package(cpr)
|
|
find_package(LibXml2)
|
|
find_package(OpenSSL)
|