Fix for macos build based on isl-org#7022

Author: quentin-leboutet

3rdparty/assimp/assimp.cmake

@@ -29,7 +29,7 @@ ExternalProject_Add(
         -DASSIMP_BUILD_ASSIMP_TOOLS=OFF
         -DASSIMP_BUILD_TESTS=OFF
         -DASSIMP_INSTALL_PDB=OFF
-        -DASSIMP_BUILD_ZLIB=ON
+        -DASSIMP_BUILD_ZLIB=OFF
         -DASSIMP_NO_EXPORT=OFF
         -DHUNTER_ENABLED=OFF # Renamed to "ASSIMP_HUNTER_ENABLED" in newer assimp.
         -DASSIMP_WARNINGS_AS_ERRORS=OFF

3rdparty/find_dependencies.cmake

@@ -855,6 +855,25 @@ if (BUILD_LIBREALSENSE)
     endif()
 endif()
 
+if(USE_SYSTEM_ZLIB)
+    open3d_find_package_3rdparty_library(3rdparty_zlib
+        PACKAGE ZLIB
+        TARGETS ZLIB::ZLIB
+    )
+    list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_SYSTEM Open3D::3rdparty_zlib)
+    endif()
+if(NOT USE_SYSTEM_ZLIB)
+    include(${Open3D_3RDPARTY_DIR}/zlib/zlib.cmake)
+    open3d_import_3rdparty_library(3rdparty_zlib
+        HIDDEN
+        INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}
+        LIB_DIR      ${ZLIB_LIB_DIR}
+        LIBRARIES    ${ZLIB_LIBRARIES}
+        DEPENDS      ext_zlib
+    )
+    list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_zlib)
+endif()
+
 # Curl
 # - Curl should be linked before PNG, otherwise it will have undefined symbols.
 # - openssl.cmake needs to be included before curl.cmake, for the
@@ -927,15 +946,6 @@ if(USE_SYSTEM_PNG)
     endif()
 endif()
 if(NOT USE_SYSTEM_PNG)
-    include(${Open3D_3RDPARTY_DIR}/zlib/zlib.cmake)
-    open3d_import_3rdparty_library(3rdparty_zlib
-        HIDDEN
-        INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}
-        LIB_DIR      ${ZLIB_LIB_DIR}
-        LIBRARIES    ${ZLIB_LIBRARIES}
-        DEPENDS      ext_zlib
-    )
-
     include(${Open3D_3RDPARTY_DIR}/libpng/libpng.cmake)
     open3d_import_3rdparty_library(3rdparty_png
         INCLUDE_DIRS ${LIBPNG_INCLUDE_DIRS}
@@ -1138,12 +1148,24 @@ open3d_import_3rdparty_library(3rdparty_poisson
 list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_poisson)
 
 # Minizip
-if(WITH_MINIZIP)
-    open3d_pkg_config_3rdparty_library(3rdparty_minizip
-        SEARCH_ARGS minizip
+if(USE_SYSTEM_MINIZIP)
+    open3d_find_package_3rdparty_library(3rdparty_zlib
+        PACKAGE minizip
+        TARGETS MINIZIP::minizip
     )
     list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_SYSTEM Open3D::3rdparty_minizip)
 endif()
+if(NOT USE_SYSTEM_MINIZIP)
+    include(${Open3D_3RDPARTY_DIR}/zlib/minizip.cmake)
+    open3d_import_3rdparty_library(3rdparty_minizip
+        HIDDEN
+        INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}
+        LIB_DIR      ${MINIZIP_LIB_DIR}
+        LIBRARIES    ${MINIZIP_LIBRARIES}
+        DEPENDS      ext_minizip
+    )
+    list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_minizip)
+endif()
 
 # Googletest
 if (BUILD_UNIT_TESTS)

3rdparty/libpng/libpng.cmake

@@ -4,23 +4,24 @@ if(MSVC)
     set(LIBPNG_LIB_NAME libpng16_static)
 else()
     set(LIBPNG_LIB_NAME png16)
+    # Add the -fno-define-target-os-macros flag for non-MSVC compilers (for instance, Clang)
 endif()
 
 ExternalProject_Add(
     ext_libpng
     PREFIX libpng
-    URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.37.tar.gz
-    URL_HASH SHA256=ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307
+    URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.47.tar.gz
+    URL_HASH SHA256=631a4c58ea6c10c81f160c4b21fa8495b715d251698ebc2552077e8450f30454
     DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/libpng"
     UPDATE_COMMAND ""
     CMAKE_ARGS
         -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+        -DCMAKE_CXX_FLAGS=-fno-define-target-os-macros
         -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
         -DPNG_SHARED=OFF
         -DPNG_EXECUTABLES=OFF
         -DPNG_TESTS=OFF
-        -DPNG_BUILD_ZLIB=ON # Prevent libpng from calling find_pacakge(zlib).
-        -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}
+        -DPNG_BUILD_ZLIB=OFF
         -DPNG_ARM_NEON=off # Must be lower case.
         ${ExternalProject_CMAKE_ARGS_hidden}
     BUILD_BYPRODUCTS

3rdparty/openblas/openblas.cmake

@@ -14,6 +14,7 @@ ExternalProject_Add(
     DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/openblas"
     CMAKE_ARGS
         ${ExternalProject_CMAKE_ARGS}
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5
         -DTARGET=${OPENBLAS_TARGET}
         -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     BUILD_BYPRODUCTS 

3rdparty/possionrecon/eigen_rows.patch

@@ -0,0 +1,21 @@
+diff -u a/Src/SparseMatrix.inl b/Src/SparseMatrix.inl
+--- a/Src/SparseMatrix.inl
++++ b/Src/SparseMatrix.inl
+@@ -463,7 +463,7 @@
+ 	A.resize( aRows );
+ 	for( size_t i=0 ; i<aRows ; i++ ) A.rowSizes[i] = 0;
+ 	for( size_t i=0 ; i<At.rows() ; i++ ) for( const_iterator iter=At.begin(i) ; iter!=At.end(i) ; iter++ ) A.rowSizes[ iter->N ]++;
+-	for( size_t i=0 ; i<A.rows ; i++ )
++	for( size_t i=0 ; i<A.rows() ; i++ )
+ 	{
+ 		size_t t = A.rowSizes[i];
+ 		A.rowSizes[i] = 0;
+@@ -496,7 +496,7 @@
+ 	A.resize( aRows );
+ 	for( size_t i=0 ; i<aRows ; i++ ) A.rowSizes[i] = 0;
+ 	for( size_t i=0 ; i<At.rows() ; i++ ) for( const_iterator iter=At.begin(i) ; iter!=At.end(i) ; iter++ ) A.rowSizes[ iter->N ]++;
+-	for( size_t i=0 ; i<A.rows ; i++ )
++	for( size_t i=0 ; i<A.rows() ; i++ )
+ 	{
+ 		size_t t = A.rowSizes[i];
+ 		A.rowSizes[i] = 0;

3rdparty/possionrecon/possionrecon.cmake

@@ -11,6 +11,9 @@ ExternalProject_Add(
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
+    PATCH_COMMAND ${GIT_EXECUTABLE} init
+    COMMAND       ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace --verbose
+                  ${CMAKE_CURRENT_LIST_DIR}/eigen_rows.patch
 )
 
 ExternalProject_Get_Property(ext_poisson SOURCE_DIR)

3rdparty/vtk/vtk_build.cmake

@@ -43,6 +43,7 @@ if(BUILD_VTK_FROM_SOURCE)
         UPDATE_COMMAND ""
         CMAKE_ARGS
             ${ExternalProject_CMAKE_ARGS_hidden}
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5
             -DBUILD_SHARED_LIBS=OFF
             -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
             -DVTK_GROUP_ENABLE_Imaging=NO

3rdparty/zlib/0001-patch-zlib-to-enable-unzip.patch

@@ -37,3 +37,21 @@ Gailly and Mark Adler; it does not include third-party code.
 If you redistribute modified sources, we would appreciate that you include in
 the file ChangeLog history information documenting your changes.  Please read
 the FAQ for more information on the distribution of modified source versions.
+
+Condition of use and distribution are the same as zlib:
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgement in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.

3rdparty/zlib/LICENSE

@@ -0,0 +1,40 @@
+include(ExternalProject)
+
+find_package(Git QUIET REQUIRED)
+
+ExternalProject_Get_Property(ext_zlib INSTALL_DIR)
+set(ZLIB_INSTALL_DIR ${INSTALL_DIR})
+unset(INSTALL_DIR)
+
+set(lib_name minizip)
+
+ExternalProject_Add(ext_minizip
+    PREFIX minizip-ng
+    URL https://github.com/zlib-ng/minizip-ng/archive/refs/tags/4.0.7.tar.gz
+    URL_HASH SHA256=a87f1f734f97095fe1ef0018217c149d53d0f78438bcb77af38adc21dff2dfbc
+    DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/minizip-ng"
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+        -DMZ_COMPAT:BOOL=ON
+        -DMZ_ZLIB:BOOL=ON
+        -DMZ_BZIP2:BOOL=OFF
+        -DMZ_LZMA:BOOL=OFF
+        -DMZ_ZSTD:BOOL=OFF
+        -DMZ_LIBCOMP:BOOL=OFF
+        -DMZ_FETCH_LIBS:BOOL=OFF
+        -DMZ_FORCE_FETCH_LIBS:BOOL=OFF
+        -DMZ_PKCRYPT:BOOL=OFF
+        -DMZ_WZAES:BOOL=OFF
+        -DMZ_OPENSSL:BOOL=OFF
+        -DMZ_LIBBSD:BOOL=OFF
+        -DMZ_ICONV:BOOL=OFF
+        -DZLIB_ROOT:PATH=${ZLIB_INSTALL_DIR}
+        ${ExternalProject_CMAKE_ARGS}
+    BUILD_BYPRODUCTS
+        <INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX}
+)
+
+ExternalProject_Get_Property(ext_minizip INSTALL_DIR)
+set(MINIZIP_INCLUDE_DIRS ${INSTALL_DIR}/include/minizip/) # "/" is critical.
+set(MINIZIP_LIB_DIR ${INSTALL_DIR}/lib)
+set(MINIZIP_LIBRARIES ${lib_name})