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
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
|
|
index cda6c7f..32d807a 100644
|
|
--- a/scwx-qt/scwx-qt.cmake
|
|
+++ b/scwx-qt/scwx-qt.cmake
|
|
@@ -601,6 +601,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
|
Boost::json
|
|
Boost::timer
|
|
QMapLibre::Core
|
|
+ QMapLibre::Widgets
|
|
$<$<CXX_COMPILER_ID:MSVC>:opengl32>
|
|
Fontconfig::Fontconfig
|
|
GeographicLib::GeographicLib
|
|
@@ -615,40 +616,13 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
|
target_link_libraries(supercell-wx PRIVATE scwx-qt
|
|
wxdata)
|
|
|
|
-# Set DT_RUNPATH for Linux targets
|
|
-set_target_properties(MLNQtCore PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core
|
|
-set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
|
|
-
|
|
install(TARGETS supercell-wx
|
|
- MLNQtCore # QMapLibre::Core
|
|
- RUNTIME_DEPENDENCIES
|
|
- PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" "qt6"
|
|
- POST_EXCLUDE_REGEXES ".*system32/.*\\.dll"
|
|
- "^(/usr)?/lib/.*\\.so(\\..*)?"
|
|
RUNTIME
|
|
COMPONENT supercell-wx
|
|
LIBRARY
|
|
COMPONENT supercell-wx
|
|
OPTIONAL)
|
|
|
|
-# NO_TRANSLATIONS is needed for Qt 6.5.0 (will be fixed in 6.5.1)
|
|
-# https://bugreports.qt.io/browse/QTBUG-112204
|
|
-qt_generate_deploy_app_script(TARGET MLNQtCore # QMapLibre::Core
|
|
- OUTPUT_SCRIPT deploy_script_qmaplibre_core
|
|
- NO_TRANSLATIONS
|
|
- NO_UNSUPPORTED_PLATFORM_ERROR)
|
|
-
|
|
-qt_generate_deploy_app_script(TARGET supercell-wx
|
|
- OUTPUT_SCRIPT deploy_script_scwx
|
|
- NO_TRANSLATIONS
|
|
- NO_UNSUPPORTED_PLATFORM_ERROR)
|
|
-
|
|
-install(SCRIPT ${deploy_script_qmaplibre_core}
|
|
- COMPONENT supercell-wx)
|
|
-
|
|
-install(SCRIPT ${deploy_script_scwx}
|
|
- COMPONENT supercell-wx)
|
|
-
|
|
if (MSVC)
|
|
set(CPACK_PACKAGE_NAME "Supercell Wx")
|
|
set(CPACK_PACKAGE_VENDOR "Dan Paulat")
|