Base: Move zipios library to 3rdParty folder.

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()

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)

src/App/CMakeLists.txt

@@ -60,6 +60,7 @@ include_directories(
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
+    ${ZIPIOS_INCLUDES}
 )
 
 set(FreeCADApp_LIBS

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_)

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 

src/Gui/CMakeLists.txt

@@ -63,6 +63,7 @@ include_directories(
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
+    ${ZIPIOS_INCLUDES}
     ${3DCONNEXION_INCLUDE_DIR}
 )
 

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}
 )

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}

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}

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}
 )

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}
 )
 

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}
 )

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})

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}
 )

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}
 )

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}
 )

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})

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}

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})

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

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}
 )

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}

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}
 )

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}
 )

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}
 )

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}

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})
 

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}
 )

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}

src/Mod/Start/App/CMakeLists.txt

@@ -24,6 +24,7 @@
 include_directories(
         ${PYTHON_INCLUDE_DIRS}
         ${QtCore_INCLUDE_DIRS}
+        ${ZIPIOS_INCLUDES}
 )
 
 set(Start_LIBS

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}

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}
 )

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

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})
 

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})