From be82f4db9eafa63c7497c2abe3449b83b6babd00 Mon Sep 17 00:00:00 2001 From: flow Date: Sat, 16 Apr 2022 10:10:13 -0300 Subject: [PATCH 1/3] libs: Don't force bundled libs Now that QuaZip 1.3 is released, packages from package managers can include the patch needed for PolyMC, so we can use the users system libraries if available. --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1350a3ba..2c36d847 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,8 +107,7 @@ set(Launcher_DISCORD_URL "https://discord.gg/Z52pwxWCHP" CACHE STRING "URL for t set(Launcher_SUBREDDIT_URL "https://www.reddit.com/r/PolyMCLauncher/" CACHE STRING "URL for the subreddit.") # Builds -# TODO: Launcher_FORCE_BUNDLED_LIBS should be off in the future, but as of QuaZip 1.2, we can't do that yet. -set(Launcher_FORCE_BUNDLED_LIBS ON CACHE BOOL "Prevent using system libraries, if they are available as submodules") +set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules") set(Launcher_QT_VERSION_MAJOR "5" CACHE STRING "Major Qt version to build against") From af167e8e6702efb9232a6a99f5e64cf7a92aabad Mon Sep 17 00:00:00 2001 From: flow Date: Sat, 16 Apr 2022 10:17:33 -0300 Subject: [PATCH 2/3] libs: update bundled submodules --- libraries/libnbtplusplus | 2 +- libraries/quazip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/libnbtplusplus b/libraries/libnbtplusplus index 129be45a..2203af7e 160000 --- a/libraries/libnbtplusplus +++ b/libraries/libnbtplusplus @@ -1 +1 @@ -Subproject commit 129be45a7f91920e76673af104534d215c497d85 +Subproject commit 2203af7eeb48c45398139b583615134efd8d407f diff --git a/libraries/quazip b/libraries/quazip index 09ec1d10..6117161a 160000 --- a/libraries/quazip +++ b/libraries/quazip @@ -1 +1 @@ -Subproject commit 09ec1d10c6d627f895109b21728dda000cbfa7d1 +Subproject commit 6117161af08e366c37499895b00ef62f93adc345 From ba020fbd2176460021b0f552b7178af9562bd4bf Mon Sep 17 00:00:00 2001 From: flow Date: Sat, 16 Apr 2022 11:23:42 -0300 Subject: [PATCH 3/3] fix: Don't error when not finding valid system quazip --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c36d847..9530ff10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,7 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 5) find_package(Qt5 REQUIRED COMPONENTS Core Widgets Concurrent Network Test Xml) if(NOT Launcher_FORCE_BUNDLED_LIBS) - find_package(QuaZip-Qt5 REQUIRED) + find_package(QuaZip-Qt5 1.3) endif() if (NOT QuaZip-Qt5_FOUND) set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}" FORCE) @@ -276,6 +276,8 @@ if (FORCE_BUNDLED_QUAZIP) set(BUILD_SHARED_LIBS 0) # link statically to avoid conflicts. set(QUAZIP_INSTALL 0) add_subdirectory(libraries/quazip) # zip manipulation library +else() + message(STATUS "Using system QuaZip") endif() add_subdirectory(libraries/rainbow) # Qt extension for colors add_subdirectory(libraries/iconfix) # fork of Qt's QIcon loader