Skip to content

chore(build): Find QuaZip library #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
effigies wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore(build): Find QuaZip library #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,22 @@ ENDIF (ZLIB_FOUND)
# Try to find QuaZip, otherwise use bundled
#
SET(QUAZIP_RESULT "Not Found")
FIND_PACKAGE(QuaZip QUIET)
IF (WORKBENCH_USE_QT6)
FIND_PACKAGE(QuaZip-Qt6 QUIET)
IF (QuaZip-Qt6_FOUND)
SET(QUAZIP_FOUND 1)
SET(QUAZIP_RESULT "${QuaZip-Qt6_VERSION} ${QuaZip-Qt6_DIR}")
ENDIF (QuaZip-Qt6_FOUND)
ELSE (WORKBENCH_USE_QT6)
FIND_PACKAGE(QuaZip-Qt5 QUIET)
IF (QuaZip-Qt5_FOUND)
SET(QUAZIP_FOUND 1)
SET(QUAZIP_RESULT "${QuaZip-Qt5_VERSION} ${QuaZip-Qt5_DIR}")
ENDIF (QuaZip-Qt5_FOUND)
ENDIF (WORKBENCH_USE_QT6)

IF (QUAZIP_FOUND)
SET(QUAZIP_RESULT "Using QuaZip Library ${QUAZIP_LIBRARIES}")
ADD_DEFINITIONS(-DHAVE_QUAZIP)
ELSE (QUAZIP_FOUND)
#
# Quazip needs this defined here for static linking on windows
Expand Down
3 changes: 3 additions & 0 deletions src/Operations/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,3 +250,6 @@ IF (OSMESA_FOUND)
INCLUDE_DIRECTORIES(${OSMESA_INCLUDE_DIRECTORY})
ENDIF (OSMESA_FOUND)

IF (QUAZIP_FOUND)
TARGET_LINK_LIBRARIES(Operations QuaZip::QuaZip)
ENDIF (QUAZIP_FOUND)
5 changes: 5 additions & 0 deletions src/Operations/OperationZipSceneFile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,13 @@
#include "ScenePathName.h"
#include "SpecFile.h"

#ifdef HAVE_QUAZIP
#include <quazip/quazip.h>
#include <quazip/quazipfile.h>
#else
#include "quazip.h"
#include "quazipfile.h"
#endif // HAVE_QUAZIP

#include <QDir>

Expand Down
5 changes: 5 additions & 0 deletions src/Operations/OperationZipSpecFile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,13 @@
#include "OperationException.h"
#include "SpecFile.h"

#ifdef HAVE_QUAZIP
#include <quazip/quazip.h>
#include <quazip/quazipfile.h>
#else
#include "quazip.h"
#include "quazipfile.h"
#endif // HAVE_QUAZIP

//for cleanPath
#include <QDir>
Expand Down