646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
|
index 2137ae62..041cb87d 100644
|
|
--- a/external/CMakeLists.txt
|
|
+++ b/external/CMakeLists.txt
|
|
@@ -14,7 +14,7 @@ set_property(DIRECTORY
|
|
units.cmake
|
|
qt6ct.cmake)
|
|
|
|
-include(aws-sdk-cpp.cmake)
|
|
+find_package(AWSSDK CONFIG REQUIRED)
|
|
include(date.cmake)
|
|
include(hsluv-c.cmake)
|
|
include(imgui.cmake)
|
|
diff --git a/external/stb.cmake b/external/stb.cmake
|
|
index 570af425..f9817226 100644
|
|
--- a/external/stb.cmake
|
|
+++ b/external/stb.cmake
|
|
@@ -1,4 +1,3 @@
|
|
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 09ea6fe3..c20a2cb6 100644
|
|
--- a/scwx-qt/scwx-qt.cmake
|
|
+++ b/scwx-qt/scwx-qt.cmake
|
|
@@ -11,14 +11,15 @@ set(CMAKE_AUTORCC ON)
|
|
set(CMAKE_CXX_STANDARD 20)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
-find_package(Boost)
|
|
+find_package(Boost REQUIRED COMPONENTS json timer)
|
|
find_package(Fontconfig)
|
|
-find_package(geographiclib)
|
|
+find_package(GeographicLib)
|
|
find_package(geos)
|
|
find_package(GLEW)
|
|
find_package(glm)
|
|
find_package(Python COMPONENTS Interpreter)
|
|
find_package(SQLite3)
|
|
+find_package(PNG)
|
|
|
|
find_package(QT NAMES Qt6
|
|
COMPONENTS Gui
|
|
@@ -699,6 +700,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
|
imgui
|
|
qt6ct-common
|
|
SQLite::SQLite3
|
|
+ PNG::PNG
|
|
wxdata)
|
|
|
|
target_link_libraries(supercell-wx PRIVATE scwx-qt
|
|
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
|
|
index 94b0e3a7..a36c2c81 100644
|
|
--- a/wxdata/wxdata.cmake
|
|
+++ b/wxdata/wxdata.cmake
|
|
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.24)
|
|
|
|
project(scwx-data)
|
|
|
|
-find_package(Boost)
|
|
+find_package(Boost REQUIRED COMPONENTS iostreams)
|
|
+find_package(BZip2)
|
|
find_package(cpr)
|
|
find_package(LibXml2)
|
|
find_package(OpenSSL)
|