From 80b299bb88907a96d681c33b205b7f0080117785 Mon Sep 17 00:00:00 2001 From: tritao Date: Mon, 20 Jan 2025 18:23:43 +0000 Subject: [PATCH] Base: Move `zipios` library to `3rdParty` folder. --- CMakeLists.txt | 1 + cMake/FreeCAD_Helpers/SetupZipIos.cmake | 67 +++++++++++++++++ src/{ => 3rdParty}/zipios++/backbuffer.h | 0 src/{ => 3rdParty}/zipios++/collcoll.cpp | 0 src/{ => 3rdParty}/zipios++/collcoll.h | 0 .../zipios++/deflateoutputstreambuf.cpp | 0 .../zipios++/deflateoutputstreambuf.h | 0 src/{ => 3rdParty}/zipios++/fcoll.cpp | 0 src/{ => 3rdParty}/zipios++/fcoll.h | 0 .../zipios++/fcollexceptions.cpp | 0 src/{ => 3rdParty}/zipios++/fcollexceptions.h | 0 src/{ => 3rdParty}/zipios++/fileentry.cpp | 0 src/{ => 3rdParty}/zipios++/fileentry.h | 0 src/{ => 3rdParty}/zipios++/filepath.cpp | 0 src/{ => 3rdParty}/zipios++/filepath.h | 0 .../zipios++/filterinputstreambuf.cpp | 0 .../zipios++/filterinputstreambuf.h | 0 .../zipios++/filteroutputstreambuf.cpp | 0 .../zipios++/filteroutputstreambuf.h | 0 .../zipios++/gzipoutputstream.cpp | 0 .../zipios++/gzipoutputstream.h | 0 .../zipios++/gzipoutputstreambuf.cpp | 0 .../zipios++/gzipoutputstreambuf.h | 0 .../zipios++/inflateinputstreambuf.cpp | 0 .../zipios++/inflateinputstreambuf.h | 0 src/{ => 3rdParty}/zipios++/meta-iostreams.h | 0 .../zipios++/outputstringstream.h | 0 src/{ => 3rdParty}/zipios++/simplesmartptr.h | 0 src/{ => 3rdParty}/zipios++/virtualseeker.h | 0 src/{ => 3rdParty}/zipios++/zipfile.cpp | 0 src/{ => 3rdParty}/zipios++/zipfile.h | 0 src/{ => 3rdParty}/zipios++/ziphead.cpp | 0 src/{ => 3rdParty}/zipios++/ziphead.h | 0 src/{ => 3rdParty}/zipios++/zipheadio.cpp | 0 src/{ => 3rdParty}/zipios++/zipheadio.h | 0 .../zipios++/zipinputstream.cpp | 0 src/{ => 3rdParty}/zipios++/zipinputstream.h | 0 .../zipios++/zipinputstreambuf.cpp | 0 .../zipios++/zipinputstreambuf.h | 0 src/{ => 3rdParty}/zipios++/zipios-config.h | 0 src/{ => 3rdParty}/zipios++/zipios.dox | 0 src/{ => 3rdParty}/zipios++/zipios_common.h | 0 src/{ => 3rdParty}/zipios++/zipios_defs.h | 0 .../zipios++/zipoutputstream.cpp | 0 src/{ => 3rdParty}/zipios++/zipoutputstream.h | 0 .../zipios++/zipoutputstreambuf.cpp | 0 .../zipios++/zipoutputstreambuf.h | 0 src/App/CMakeLists.txt | 1 + src/Base/CMakeLists.txt | 73 ++----------------- src/Doc/CMakeLists.txt | 2 +- src/Gui/CMakeLists.txt | 1 + src/Mod/CAM/App/CMakeLists.txt | 1 + src/Mod/Cloud/App/CMakeLists.txt | 1 + src/Mod/Fem/App/CMakeLists.txt | 1 + src/Mod/Inspection/App/CMakeLists.txt | 1 + src/Mod/Inspection/Gui/CMakeLists.txt | 1 + src/Mod/Material/App/CMakeLists.txt | 1 + src/Mod/Material/Gui/CMakeLists.txt | 1 + src/Mod/Mesh/App/CMakeLists.txt | 1 + src/Mod/Mesh/Gui/CMakeLists.txt | 1 + src/Mod/Part/App/CMakeLists.txt | 1 + src/Mod/Part/Gui/CMakeLists.txt | 1 + src/Mod/PartDesign/App/CMakeLists.txt | 1 + src/Mod/PartDesign/Gui/CMakeLists.txt | 1 + src/Mod/Points/App/CMakeLists.txt | 1 + src/Mod/Points/Gui/CMakeLists.txt | 1 + src/Mod/ReverseEngineering/App/CMakeLists.txt | 1 + src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 1 + src/Mod/Robot/App/CMakeLists.txt | 1 + src/Mod/Sandbox/Gui/CMakeLists.txt | 1 + src/Mod/Sketcher/App/CMakeLists.txt | 1 + src/Mod/Sketcher/Gui/CMakeLists.txt | 1 + src/Mod/Spreadsheet/App/CMakeLists.txt | 1 + src/Mod/Spreadsheet/Gui/CMakeLists.txt | 1 + src/Mod/Start/App/CMakeLists.txt | 1 + src/Mod/TechDraw/App/CMakeLists.txt | 1 + src/Mod/TechDraw/Gui/CMakeLists.txt | 1 + tests/CMakeLists.txt | 2 + tests/src/Mod/Mesh/CMakeLists.txt | 1 + tests/src/Mod/Points/CMakeLists.txt | 1 + 80 files changed, 106 insertions(+), 69 deletions(-) create mode 100644 cMake/FreeCAD_Helpers/SetupZipIos.cmake rename src/{ => 3rdParty}/zipios++/backbuffer.h (100%) rename src/{ => 3rdParty}/zipios++/collcoll.cpp (100%) rename src/{ => 3rdParty}/zipios++/collcoll.h (100%) rename src/{ => 3rdParty}/zipios++/deflateoutputstreambuf.cpp (100%) rename src/{ => 3rdParty}/zipios++/deflateoutputstreambuf.h (100%) rename src/{ => 3rdParty}/zipios++/fcoll.cpp (100%) rename src/{ => 3rdParty}/zipios++/fcoll.h (100%) rename src/{ => 3rdParty}/zipios++/fcollexceptions.cpp (100%) rename src/{ => 3rdParty}/zipios++/fcollexceptions.h (100%) rename src/{ => 3rdParty}/zipios++/fileentry.cpp (100%) rename src/{ => 3rdParty}/zipios++/fileentry.h (100%) rename src/{ => 3rdParty}/zipios++/filepath.cpp (100%) rename src/{ => 3rdParty}/zipios++/filepath.h (100%) rename src/{ => 3rdParty}/zipios++/filterinputstreambuf.cpp (100%) rename src/{ => 3rdParty}/zipios++/filterinputstreambuf.h (100%) rename src/{ => 3rdParty}/zipios++/filteroutputstreambuf.cpp (100%) rename src/{ => 3rdParty}/zipios++/filteroutputstreambuf.h (100%) rename src/{ => 3rdParty}/zipios++/gzipoutputstream.cpp (100%) rename src/{ => 3rdParty}/zipios++/gzipoutputstream.h (100%) rename src/{ => 3rdParty}/zipios++/gzipoutputstreambuf.cpp (100%) rename src/{ => 3rdParty}/zipios++/gzipoutputstreambuf.h (100%) rename src/{ => 3rdParty}/zipios++/inflateinputstreambuf.cpp (100%) rename src/{ => 3rdParty}/zipios++/inflateinputstreambuf.h (100%) rename src/{ => 3rdParty}/zipios++/meta-iostreams.h (100%) rename src/{ => 3rdParty}/zipios++/outputstringstream.h (100%) rename src/{ => 3rdParty}/zipios++/simplesmartptr.h (100%) rename src/{ => 3rdParty}/zipios++/virtualseeker.h (100%) rename src/{ => 3rdParty}/zipios++/zipfile.cpp (100%) rename src/{ => 3rdParty}/zipios++/zipfile.h (100%) rename src/{ => 3rdParty}/zipios++/ziphead.cpp (100%) rename src/{ => 3rdParty}/zipios++/ziphead.h (100%) rename src/{ => 3rdParty}/zipios++/zipheadio.cpp (100%) rename src/{ => 3rdParty}/zipios++/zipheadio.h (100%) rename src/{ => 3rdParty}/zipios++/zipinputstream.cpp (100%) rename src/{ => 3rdParty}/zipios++/zipinputstream.h (100%) rename src/{ => 3rdParty}/zipios++/zipinputstreambuf.cpp (100%) rename src/{ => 3rdParty}/zipios++/zipinputstreambuf.h (100%) rename src/{ => 3rdParty}/zipios++/zipios-config.h (100%) rename src/{ => 3rdParty}/zipios++/zipios.dox (100%) rename src/{ => 3rdParty}/zipios++/zipios_common.h (100%) rename src/{ => 3rdParty}/zipios++/zipios_defs.h (100%) rename src/{ => 3rdParty}/zipios++/zipoutputstream.cpp (100%) rename src/{ => 3rdParty}/zipios++/zipoutputstream.h (100%) rename src/{ => 3rdParty}/zipios++/zipoutputstreambuf.cpp (100%) rename src/{ => 3rdParty}/zipios++/zipoutputstreambuf.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4dd28e0c3..9c04878894 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ FreeCADLibpackChecks() SetupDoxygen() SetupLibFmt() SetupYamlCpp() +SetupZipIos() if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER OR FREECAD_LIBPACK_CHECKFILE_VERSION) SetupPython() SetupPCL() diff --git a/cMake/FreeCAD_Helpers/SetupZipIos.cmake b/cMake/FreeCAD_Helpers/SetupZipIos.cmake new file mode 100644 index 0000000000..539315eff8 --- /dev/null +++ b/cMake/FreeCAD_Helpers/SetupZipIos.cmake @@ -0,0 +1,67 @@ +macro(SetupZipIos) +# -------------------------------- ZipIos -------------------------------- + + # Use external zipios++ if specified. + if(FREECAD_USE_EXTERNAL_ZIPIOS) + find_library(ZIPIOS_LIBRARY zipios) + find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h) + if(ZIPIOS_LIBRARY) + message(STATUS "Found zipios++: ${ZIPIOS}") + endif() + if(ZIPIOS_INCLUDES) + message(STATUS "Found zipios++ headers.") + endif() + if(NOT ZIPIOS_LIBRARY OR NOT ZIPIOS_INCLUDES) + message(FATAL_ERROR "Using external zipios++ was specified but was not found.") + endif() + else(FREECAD_USE_EXTERNAL_ZIPIOS) + set(ZIPIOS_INCLUDES ${CMAKE_SOURCE_DIR}/src/3rdParty) + SET(zipios_SRCS + ${ZIPIOS_INCLUDES}/zipios++/backbuffer.h + ${ZIPIOS_INCLUDES}/zipios++/collcoll.cpp + ${ZIPIOS_INCLUDES}/zipios++/collcoll.h + ${ZIPIOS_INCLUDES}/zipios++/deflateoutputstreambuf.cpp + ${ZIPIOS_INCLUDES}/zipios++/deflateoutputstreambuf.h + ${ZIPIOS_INCLUDES}/zipios++/fcoll.cpp + ${ZIPIOS_INCLUDES}/zipios++/fcoll.h + ${ZIPIOS_INCLUDES}/zipios++/fcollexceptions.cpp + ${ZIPIOS_INCLUDES}/zipios++/fcollexceptions.h + ${ZIPIOS_INCLUDES}/zipios++/fileentry.cpp + ${ZIPIOS_INCLUDES}/zipios++/fileentry.h + ${ZIPIOS_INCLUDES}/zipios++/filepath.cpp + ${ZIPIOS_INCLUDES}/zipios++/filepath.h + ${ZIPIOS_INCLUDES}/zipios++/filterinputstreambuf.cpp + ${ZIPIOS_INCLUDES}/zipios++/filterinputstreambuf.h + ${ZIPIOS_INCLUDES}/zipios++/filteroutputstreambuf.cpp + ${ZIPIOS_INCLUDES}/zipios++/filteroutputstreambuf.h + ${ZIPIOS_INCLUDES}/zipios++/gzipoutputstream.cpp + ${ZIPIOS_INCLUDES}/zipios++/gzipoutputstream.h + ${ZIPIOS_INCLUDES}/zipios++/gzipoutputstreambuf.cpp + ${ZIPIOS_INCLUDES}/zipios++/gzipoutputstreambuf.h + ${ZIPIOS_INCLUDES}/zipios++/inflateinputstreambuf.cpp + ${ZIPIOS_INCLUDES}/zipios++/inflateinputstreambuf.h + ${ZIPIOS_INCLUDES}/zipios++/meta-iostreams.h + ${ZIPIOS_INCLUDES}/zipios++/outputstringstream.h + ${ZIPIOS_INCLUDES}/zipios++/simplesmartptr.h + ${ZIPIOS_INCLUDES}/zipios++/virtualseeker.h + ${ZIPIOS_INCLUDES}/zipios++/zipfile.cpp + ${ZIPIOS_INCLUDES}/zipios++/zipfile.h + ${ZIPIOS_INCLUDES}/zipios++/ziphead.cpp + ${ZIPIOS_INCLUDES}/zipios++/ziphead.h + ${ZIPIOS_INCLUDES}/zipios++/zipheadio.cpp + ${ZIPIOS_INCLUDES}/zipios++/zipheadio.h + ${ZIPIOS_INCLUDES}/zipios++/zipinputstream.cpp + ${ZIPIOS_INCLUDES}/zipios++/zipinputstream.h + ${ZIPIOS_INCLUDES}/zipios++/zipinputstreambuf.cpp + ${ZIPIOS_INCLUDES}/zipios++/zipinputstreambuf.h + ${ZIPIOS_INCLUDES}/zipios++/zipios_common.h + ${ZIPIOS_INCLUDES}/zipios++/zipios-config.h + ${ZIPIOS_INCLUDES}/zipios++/zipios_defs.h + ${ZIPIOS_INCLUDES}/zipios++/zipoutputstreambuf.cpp + ${ZIPIOS_INCLUDES}/zipios++/zipoutputstreambuf.h + ${ZIPIOS_INCLUDES}/zipios++/zipoutputstream.cpp + ${ZIPIOS_INCLUDES}/zipios++/zipoutputstream.h + ) + endif(FREECAD_USE_EXTERNAL_ZIPIOS) + +endmacro(SetupZipIos) diff --git a/src/zipios++/backbuffer.h b/src/3rdParty/zipios++/backbuffer.h similarity index 100% rename from src/zipios++/backbuffer.h rename to src/3rdParty/zipios++/backbuffer.h diff --git a/src/zipios++/collcoll.cpp b/src/3rdParty/zipios++/collcoll.cpp similarity index 100% rename from src/zipios++/collcoll.cpp rename to src/3rdParty/zipios++/collcoll.cpp diff --git a/src/zipios++/collcoll.h b/src/3rdParty/zipios++/collcoll.h similarity index 100% rename from src/zipios++/collcoll.h rename to src/3rdParty/zipios++/collcoll.h diff --git a/src/zipios++/deflateoutputstreambuf.cpp b/src/3rdParty/zipios++/deflateoutputstreambuf.cpp similarity index 100% rename from src/zipios++/deflateoutputstreambuf.cpp rename to src/3rdParty/zipios++/deflateoutputstreambuf.cpp diff --git a/src/zipios++/deflateoutputstreambuf.h b/src/3rdParty/zipios++/deflateoutputstreambuf.h similarity index 100% rename from src/zipios++/deflateoutputstreambuf.h rename to src/3rdParty/zipios++/deflateoutputstreambuf.h diff --git a/src/zipios++/fcoll.cpp b/src/3rdParty/zipios++/fcoll.cpp similarity index 100% rename from src/zipios++/fcoll.cpp rename to src/3rdParty/zipios++/fcoll.cpp diff --git a/src/zipios++/fcoll.h b/src/3rdParty/zipios++/fcoll.h similarity index 100% rename from src/zipios++/fcoll.h rename to src/3rdParty/zipios++/fcoll.h diff --git a/src/zipios++/fcollexceptions.cpp b/src/3rdParty/zipios++/fcollexceptions.cpp similarity index 100% rename from src/zipios++/fcollexceptions.cpp rename to src/3rdParty/zipios++/fcollexceptions.cpp diff --git a/src/zipios++/fcollexceptions.h b/src/3rdParty/zipios++/fcollexceptions.h similarity index 100% rename from src/zipios++/fcollexceptions.h rename to src/3rdParty/zipios++/fcollexceptions.h diff --git a/src/zipios++/fileentry.cpp b/src/3rdParty/zipios++/fileentry.cpp similarity index 100% rename from src/zipios++/fileentry.cpp rename to src/3rdParty/zipios++/fileentry.cpp diff --git a/src/zipios++/fileentry.h b/src/3rdParty/zipios++/fileentry.h similarity index 100% rename from src/zipios++/fileentry.h rename to src/3rdParty/zipios++/fileentry.h diff --git a/src/zipios++/filepath.cpp b/src/3rdParty/zipios++/filepath.cpp similarity index 100% rename from src/zipios++/filepath.cpp rename to src/3rdParty/zipios++/filepath.cpp diff --git a/src/zipios++/filepath.h b/src/3rdParty/zipios++/filepath.h similarity index 100% rename from src/zipios++/filepath.h rename to src/3rdParty/zipios++/filepath.h diff --git a/src/zipios++/filterinputstreambuf.cpp b/src/3rdParty/zipios++/filterinputstreambuf.cpp similarity index 100% rename from src/zipios++/filterinputstreambuf.cpp rename to src/3rdParty/zipios++/filterinputstreambuf.cpp diff --git a/src/zipios++/filterinputstreambuf.h b/src/3rdParty/zipios++/filterinputstreambuf.h similarity index 100% rename from src/zipios++/filterinputstreambuf.h rename to src/3rdParty/zipios++/filterinputstreambuf.h diff --git a/src/zipios++/filteroutputstreambuf.cpp b/src/3rdParty/zipios++/filteroutputstreambuf.cpp similarity index 100% rename from src/zipios++/filteroutputstreambuf.cpp rename to src/3rdParty/zipios++/filteroutputstreambuf.cpp diff --git a/src/zipios++/filteroutputstreambuf.h b/src/3rdParty/zipios++/filteroutputstreambuf.h similarity index 100% rename from src/zipios++/filteroutputstreambuf.h rename to src/3rdParty/zipios++/filteroutputstreambuf.h diff --git a/src/zipios++/gzipoutputstream.cpp b/src/3rdParty/zipios++/gzipoutputstream.cpp similarity index 100% rename from src/zipios++/gzipoutputstream.cpp rename to src/3rdParty/zipios++/gzipoutputstream.cpp diff --git a/src/zipios++/gzipoutputstream.h b/src/3rdParty/zipios++/gzipoutputstream.h similarity index 100% rename from src/zipios++/gzipoutputstream.h rename to src/3rdParty/zipios++/gzipoutputstream.h diff --git a/src/zipios++/gzipoutputstreambuf.cpp b/src/3rdParty/zipios++/gzipoutputstreambuf.cpp similarity index 100% rename from src/zipios++/gzipoutputstreambuf.cpp rename to src/3rdParty/zipios++/gzipoutputstreambuf.cpp diff --git a/src/zipios++/gzipoutputstreambuf.h b/src/3rdParty/zipios++/gzipoutputstreambuf.h similarity index 100% rename from src/zipios++/gzipoutputstreambuf.h rename to src/3rdParty/zipios++/gzipoutputstreambuf.h diff --git a/src/zipios++/inflateinputstreambuf.cpp b/src/3rdParty/zipios++/inflateinputstreambuf.cpp similarity index 100% rename from src/zipios++/inflateinputstreambuf.cpp rename to src/3rdParty/zipios++/inflateinputstreambuf.cpp diff --git a/src/zipios++/inflateinputstreambuf.h b/src/3rdParty/zipios++/inflateinputstreambuf.h similarity index 100% rename from src/zipios++/inflateinputstreambuf.h rename to src/3rdParty/zipios++/inflateinputstreambuf.h diff --git a/src/zipios++/meta-iostreams.h b/src/3rdParty/zipios++/meta-iostreams.h similarity index 100% rename from src/zipios++/meta-iostreams.h rename to src/3rdParty/zipios++/meta-iostreams.h diff --git a/src/zipios++/outputstringstream.h b/src/3rdParty/zipios++/outputstringstream.h similarity index 100% rename from src/zipios++/outputstringstream.h rename to src/3rdParty/zipios++/outputstringstream.h diff --git a/src/zipios++/simplesmartptr.h b/src/3rdParty/zipios++/simplesmartptr.h similarity index 100% rename from src/zipios++/simplesmartptr.h rename to src/3rdParty/zipios++/simplesmartptr.h diff --git a/src/zipios++/virtualseeker.h b/src/3rdParty/zipios++/virtualseeker.h similarity index 100% rename from src/zipios++/virtualseeker.h rename to src/3rdParty/zipios++/virtualseeker.h diff --git a/src/zipios++/zipfile.cpp b/src/3rdParty/zipios++/zipfile.cpp similarity index 100% rename from src/zipios++/zipfile.cpp rename to src/3rdParty/zipios++/zipfile.cpp diff --git a/src/zipios++/zipfile.h b/src/3rdParty/zipios++/zipfile.h similarity index 100% rename from src/zipios++/zipfile.h rename to src/3rdParty/zipios++/zipfile.h diff --git a/src/zipios++/ziphead.cpp b/src/3rdParty/zipios++/ziphead.cpp similarity index 100% rename from src/zipios++/ziphead.cpp rename to src/3rdParty/zipios++/ziphead.cpp diff --git a/src/zipios++/ziphead.h b/src/3rdParty/zipios++/ziphead.h similarity index 100% rename from src/zipios++/ziphead.h rename to src/3rdParty/zipios++/ziphead.h diff --git a/src/zipios++/zipheadio.cpp b/src/3rdParty/zipios++/zipheadio.cpp similarity index 100% rename from src/zipios++/zipheadio.cpp rename to src/3rdParty/zipios++/zipheadio.cpp diff --git a/src/zipios++/zipheadio.h b/src/3rdParty/zipios++/zipheadio.h similarity index 100% rename from src/zipios++/zipheadio.h rename to src/3rdParty/zipios++/zipheadio.h diff --git a/src/zipios++/zipinputstream.cpp b/src/3rdParty/zipios++/zipinputstream.cpp similarity index 100% rename from src/zipios++/zipinputstream.cpp rename to src/3rdParty/zipios++/zipinputstream.cpp diff --git a/src/zipios++/zipinputstream.h b/src/3rdParty/zipios++/zipinputstream.h similarity index 100% rename from src/zipios++/zipinputstream.h rename to src/3rdParty/zipios++/zipinputstream.h diff --git a/src/zipios++/zipinputstreambuf.cpp b/src/3rdParty/zipios++/zipinputstreambuf.cpp similarity index 100% rename from src/zipios++/zipinputstreambuf.cpp rename to src/3rdParty/zipios++/zipinputstreambuf.cpp diff --git a/src/zipios++/zipinputstreambuf.h b/src/3rdParty/zipios++/zipinputstreambuf.h similarity index 100% rename from src/zipios++/zipinputstreambuf.h rename to src/3rdParty/zipios++/zipinputstreambuf.h diff --git a/src/zipios++/zipios-config.h b/src/3rdParty/zipios++/zipios-config.h similarity index 100% rename from src/zipios++/zipios-config.h rename to src/3rdParty/zipios++/zipios-config.h diff --git a/src/zipios++/zipios.dox b/src/3rdParty/zipios++/zipios.dox similarity index 100% rename from src/zipios++/zipios.dox rename to src/3rdParty/zipios++/zipios.dox diff --git a/src/zipios++/zipios_common.h b/src/3rdParty/zipios++/zipios_common.h similarity index 100% rename from src/zipios++/zipios_common.h rename to src/3rdParty/zipios++/zipios_common.h diff --git a/src/zipios++/zipios_defs.h b/src/3rdParty/zipios++/zipios_defs.h similarity index 100% rename from src/zipios++/zipios_defs.h rename to src/3rdParty/zipios++/zipios_defs.h diff --git a/src/zipios++/zipoutputstream.cpp b/src/3rdParty/zipios++/zipoutputstream.cpp similarity index 100% rename from src/zipios++/zipoutputstream.cpp rename to src/3rdParty/zipios++/zipoutputstream.cpp diff --git a/src/zipios++/zipoutputstream.h b/src/3rdParty/zipios++/zipoutputstream.h similarity index 100% rename from src/zipios++/zipoutputstream.h rename to src/3rdParty/zipios++/zipoutputstream.h diff --git a/src/zipios++/zipoutputstreambuf.cpp b/src/3rdParty/zipios++/zipoutputstreambuf.cpp similarity index 100% rename from src/zipios++/zipoutputstreambuf.cpp rename to src/3rdParty/zipios++/zipoutputstreambuf.cpp diff --git a/src/zipios++/zipoutputstreambuf.h b/src/3rdParty/zipios++/zipoutputstreambuf.h similarity index 100% rename from src/zipios++/zipoutputstreambuf.h rename to src/3rdParty/zipios++/zipoutputstreambuf.h diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index a4ab592db6..ef2d81f6f5 100644 --- a/src/App/CMakeLists.txt +++ b/src/App/CMakeLists.txt @@ -60,6 +60,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ) set(FreeCADApp_LIBS diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index 31ec7bf2b9..d4f363aa2a 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${PYCXX_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ) if(MSVC) @@ -100,56 +101,6 @@ if(SWIG_FOUND) add_definitions(-DHAVE_SWIG=1) endif(SWIG_FOUND) -if (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++ AND NOT FREECAD_USE_EXTERNAL_ZIPIOS) -SET(zipios_SRCS - ../zipios++/backbuffer.h - ../zipios++/collcoll.cpp - ../zipios++/collcoll.h - ../zipios++/deflateoutputstreambuf.cpp - ../zipios++/deflateoutputstreambuf.h - ../zipios++/fcoll.cpp - ../zipios++/fcoll.h - ../zipios++/fcollexceptions.cpp - ../zipios++/fcollexceptions.h - ../zipios++/fileentry.cpp - ../zipios++/fileentry.h - ../zipios++/filepath.cpp - ../zipios++/filepath.h - ../zipios++/filterinputstreambuf.cpp - ../zipios++/filterinputstreambuf.h - ../zipios++/filteroutputstreambuf.cpp - ../zipios++/filteroutputstreambuf.h - ../zipios++/gzipoutputstream.cpp - ../zipios++/gzipoutputstream.h - ../zipios++/gzipoutputstreambuf.cpp - ../zipios++/gzipoutputstreambuf.h - ../zipios++/inflateinputstreambuf.cpp - ../zipios++/inflateinputstreambuf.h - ../zipios++/meta-iostreams.h - ../zipios++/outputstringstream.h - ../zipios++/simplesmartptr.h - ../zipios++/virtualseeker.h - ../zipios++/zipfile.cpp - ../zipios++/zipfile.h - ../zipios++/ziphead.cpp - ../zipios++/ziphead.h - ../zipios++/zipheadio.cpp - ../zipios++/zipheadio.h - ../zipios++/zipinputstream.cpp - ../zipios++/zipinputstream.h - ../zipios++/zipinputstreambuf.cpp - ../zipios++/zipinputstreambuf.h - ../zipios++/zipios_common.h - ../zipios++/zipios-config.h - ../zipios++/zipios_defs.h - ../zipios++/zipoutputstreambuf.cpp - ../zipios++/zipoutputstreambuf.h - ../zipios++/zipoutputstream.cpp - ../zipios++/zipoutputstream.h -) -SOURCE_GROUP("zipios" FILES ${zipios_SRCS}) -endif () - SOURCE_GROUP("pycxx" FILES ${PYCXX_SOURCES}) # auto-generate resource file with all available translations @@ -363,26 +314,12 @@ IF (MSVC) ) ENDIF(MSVC) -# Use external zipios++ if specified. if(FREECAD_USE_EXTERNAL_ZIPIOS) - find_library(ZIPIOS_LIBRARY zipios) - find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h) - if(ZIPIOS_LIBRARY) - message(STATUS "Found zipios++: ${ZIPIOS}") - endif() - if(ZIPIOS_INCLUDES) - message(STATUS "Found zipios++ headers.") - endif() - if(ZIPIOS_LIBRARY AND ZIPIOS_INCLUDES) - list(APPEND FreeCADBase_LIBS ${ZIPIOS_LIBRARY}) - include_directories(${ZIPIOS_INCLUDES}) - else() - message(FATAL_ERROR "Using external zipios++ was specified but was not found.") - endif() -else(FREECAD_USE_EXTERNAL_ZIPIOS) + list(APPEND FreeCADBase_LIBS ${ZIPIOS_LIBRARY}) +else() list(APPEND FreeCADBase_SRCS ${zipios_SRCS}) -endif(FREECAD_USE_EXTERNAL_ZIPIOS) - + SOURCE_GROUP("zipios" FILES ${zipios_SRCS}) +endif() if(FREECAD_USE_PCH) add_definitions(-D_PreComp_) diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt index 020034d676..4f41818662 100644 --- a/src/Doc/CMakeLists.txt +++ b/src/Doc/CMakeLists.txt @@ -33,7 +33,7 @@ if(DOXYGEN_FOUND) # (files containing macros definitions must be parsed before the files using them) SET(DOXYGEN_SOURCE_DIR ${COIN3D_INCLUDE_DIRS}/Inventor/fields/SoSubField.h ${CMAKE_SOURCE_DIR}/src/CXX - ${CMAKE_SOURCE_DIR}/src/zipios++ + ${CMAKE_SOURCE_DIR}/src/3rdParty/zipios++ ${CMAKE_SOURCE_DIR}/src/3rdParty ${CMAKE_SOURCE_DIR}/src/Build ${CMAKE_SOURCE_DIR}/src/Base diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index cb7fa1890e..91abf8418c 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -63,6 +63,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ${3DCONNEXION_INCLUDE_DIR} ) diff --git a/src/Mod/CAM/App/CMakeLists.txt b/src/Mod/CAM/App/CMakeLists.txt index 6e27eaac33..eb044c33a6 100644 --- a/src/Mod/CAM/App/CMakeLists.txt +++ b/src/Mod/CAM/App/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Cloud/App/CMakeLists.txt b/src/Mod/Cloud/App/CMakeLists.txt index 467c37bfe1..4803840fc1 100644 --- a/src/Mod/Cloud/App/CMakeLists.txt +++ b/src/Mod/Cloud/App/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 3904974e2f..1be47f18b4 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -23,6 +23,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${SMESH_INCLUDE_DIR} ${NETGEN_INCLUDE_DIRS} diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index fffd85d376..ecb3027692 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/src/Mod/Inspection/App/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index 448fa23db3..b2a52f8fe4 100644 --- a/src/Mod/Inspection/Gui/CMakeLists.txt +++ b/src/Mod/Inspection/Gui/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ) diff --git a/src/Mod/Material/App/CMakeLists.txt b/src/Mod/Material/App/CMakeLists.txt index da3cc37772..63d134bad8 100644 --- a/src/Mod/Material/App/CMakeLists.txt +++ b/src/Mod/Material/App/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${YAML_CPP_INCLUDE_DIR} ) diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt index 0214613322..b090ae65f6 100644 --- a/src/Mod/Material/Gui/CMakeLists.txt +++ b/src/Mod/Material/Gui/CMakeLists.txt @@ -14,6 +14,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index fe1e7a35fc..3bbd520fda 100644 --- a/src/Mod/Mesh/App/CMakeLists.txt +++ b/src/Mod/Mesh/App/CMakeLists.txt @@ -9,6 +9,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ) diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 036001d52d..39669663ac 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS}/Inventor/annex ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index 871d58c2df..1267471897 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ) diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index cc409ada8b..eecfa71816 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index d10d251f51..d0f14063a4 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${QT_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index 0cbc2eff0d..2841861cc3 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -9,6 +9,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/ ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt index a16a258c5a..aa3ac390fc 100644 --- a/src/Mod/Points/App/CMakeLists.txt +++ b/src/Mod/Points/App/CMakeLists.txt @@ -9,6 +9,7 @@ include_directories( ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/src/3rdParty/libE57Format ${CMAKE_SOURCE_DIR}/src/3rdParty/libE57Format/include diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt index 644e8c183b..8039be33be 100644 --- a/src/Mod/Points/Gui/CMakeLists.txt +++ b/src/Mod/Points/Gui/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 792ec70022..e6c8c39378 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${PCL_INCLUDE_DIRS} diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 0330c7de14..03e961b62d 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${COIN3D_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index 0babdd2edf..184979834a 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index 94c1956faa..6815d025f5 100644 --- a/src/Mod/Sandbox/Gui/CMakeLists.txt +++ b/src/Mod/Sandbox/Gui/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt index 93ab66f497..cedc0a3cc2 100644 --- a/src/Mod/Sketcher/App/CMakeLists.txt +++ b/src/Mod/Sketcher/App/CMakeLists.txt @@ -16,6 +16,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index 6c3028ec48..0491314339 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -10,6 +10,7 @@ include_directories( ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt index 0630553614..0546cb7fd8 100644 --- a/src/Mod/Spreadsheet/App/CMakeLists.txt +++ b/src/Mod/Spreadsheet/App/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt index f6a6a2f3af..5680e1b7bc 100644 --- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt +++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt index 52ccf24e2a..9c3edf1b93 100644 --- a/src/Mod/Start/App/CMakeLists.txt +++ b/src/Mod/Start/App/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${QtCore_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ) set(Start_LIBS diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index c70fd08f17..2c5bb8c15f 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index 445575c3d8..472866dc25 100644 --- a/src/Mod/TechDraw/Gui/CMakeLists.txt +++ b/src/Mod/TechDraw/Gui/CMakeLists.txt @@ -20,6 +20,7 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1499ace2cb..826bfa4251 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -70,6 +70,7 @@ function(setup_qt_test) target_include_directories(${_testname}_Tests_run PUBLIC ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ${QtGui_INCLUDE_DIRS} ${QtWidgets_INCLUDE_DIRS} ${QtTest_INCLUDE_DIRS} @@ -135,6 +136,7 @@ add_subdirectory(src) target_include_directories(Tests_run PUBLIC ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ) target_link_libraries(Tests_run gtest_main diff --git a/tests/src/Mod/Mesh/CMakeLists.txt b/tests/src/Mod/Mesh/CMakeLists.txt index 791993903d..52c9256cf4 100644 --- a/tests/src/Mod/Mesh/CMakeLists.txt +++ b/tests/src/Mod/Mesh/CMakeLists.txt @@ -4,6 +4,7 @@ target_include_directories(Mesh_tests_run PUBLIC ${OCC_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ) target_link_directories(Mesh_tests_run PUBLIC ${OCC_LIBRARY_DIR}) diff --git a/tests/src/Mod/Points/CMakeLists.txt b/tests/src/Mod/Points/CMakeLists.txt index ee627574bd..64e804f654 100644 --- a/tests/src/Mod/Points/CMakeLists.txt +++ b/tests/src/Mod/Points/CMakeLists.txt @@ -4,6 +4,7 @@ target_include_directories(Points_tests_run PUBLIC ${OCC_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} + ${ZIPIOS_INCLUDES} ) target_link_directories(Points_tests_run PUBLIC ${OCC_LIBRARY_DIR})