aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorflow <thiagodonato300@gmail.com>2022-04-16 11:23:42 -0300
committerflow <thiagodonato300@gmail.com>2022-04-16 11:27:00 -0300
commitba020fbd2176460021b0f552b7178af9562bd4bf (patch)
tree74cedc7f42b5f9f1d5a61b428fd7567184dbdcae
parentaf167e8e6702efb9232a6a99f5e64cf7a92aabad (diff)
downloadPrismLauncher-ba020fbd2176460021b0f552b7178af9562bd4bf.tar.gz
PrismLauncher-ba020fbd2176460021b0f552b7178af9562bd4bf.tar.bz2
PrismLauncher-ba020fbd2176460021b0f552b7178af9562bd4bf.zip
fix: Don't error when not finding valid system quazip
-rw-r--r--CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
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