build: Use system includes if QuaZip is found

Author: effigies

src/CMakeLists.txt

@@ -514,7 +514,12 @@ ELSE (WORKBENCH_USE_QT6)
         SET(QUAZIP_RESULT "${QuaZip-Qt5_VERSION}    ${QuaZip-Qt5_DIR}")
     ENDIF (QuaZip-Qt5_FOUND)
 ENDIF (WORKBENCH_USE_QT6)
-IF (NOT QUAZIP_FOUND)
+
+IF (QUAZIP_FOUND)
+    INCLUDE_DIRECTORIES(QuaZip::QuaZip)
+    LINK_LIBRARIES(QuaZip::QuaZip)
+    ADD_DEFINITIONS(-DHAVE_QUAZIP)
+ELSE (QUAZIP_FOUND)
     #
     # Quazip needs this defined here for static linking on windows
     #
@@ -524,7 +529,7 @@ IF (NOT QUAZIP_FOUND)
         ENDIF(MSVC)
     ENDIF(WIN32)
     SET(QUAZIP_RESULT "In Workbench Source Code")
-ENDIF (NOT QUAZIP_FOUND)
+ENDIF (QUAZIP_FOUND)
 
 ##########################################################################################
 #

src/Operations/OperationZipSceneFile.cxx

@@ -34,8 +34,13 @@
 #include "ScenePathName.h"
 #include "SpecFile.h"
 
+#ifdef HAVE_QUAZIP
+#include <quazip5/quazip.h>
+#include <quazip5/quazipfile.h>
+#else
 #include "quazip.h"
 #include "quazipfile.h"
+#endif // HAVE_QUAZIP
 
 #include <QDir>
 

src/Operations/OperationZipSpecFile.cxx

@@ -26,8 +26,13 @@
 #include "OperationException.h"
 #include "SpecFile.h"
 
+#ifdef HAVE_QUAZIP
+#include <quazip5/quazip.h>
+#include <quazip5/quazipfile.h>
+#else
 #include "quazip.h"
 #include "quazipfile.h"
+#endif // HAVE_QUAZIP
 
 //for cleanPath
 #include <QDir>