update

Author: BotellaA

cmake/ConfigureOpenGeode-IO.cmake

@@ -34,7 +34,7 @@ ExternalProject_Add(opengeode-io
         -DUSE_SUPERBUILD:BOOL=OFF
         -DASSIMP_INSTALL_PREFIX:PATH=${ASSIMP_INSTALL_PREFIX}
         -DPUGIXML_INSTALL_PREFIX:PATH=${PUGIXML_INSTALL_PREFIX}
-        -DZLIB_PATH:PATH=${ZLIB_PATH}
+        -DZLIB_INSTALL_PREFIX:PATH=${ZLIB_INSTALL_PREFIX}
         -DCMAKE_INSTALL_PREFIX:PATH=${OpenGeode-IO_PATH_BIN}/install
     BINARY_DIR ${OpenGeode-IO_PATH_BIN}
     DEPENDS 

cmake/ConfigureZlib.cmake

@@ -23,9 +23,9 @@ set(ZLIB_INSTALL_PREFIX ${ZLIB_PATH}/install)
 string(REPLACE "/MDd" "/MD" NEW_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
 ExternalProject_Add(zlib
     PREFIX ${ZLIB_PATH}
-    GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng
+    GIT_REPOSITORY https://github.com/Geode-solutions/zlib-ng
     GIT_PROGRESS ON
-    GIT_TAG fe69810c265858b7b4242663d51336726f4a98be
+    GIT_TAG af539a09424fee5c61d0249b86e449f92511dbeb
     CMAKE_GENERATOR ${CMAKE_GENERATOR}
     CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
     CMAKE_ARGS

cmake/OpenGeode-IO.cmake

@@ -27,6 +27,7 @@ option(OPENGEODE_IO_WITH_TESTS "Compile test projects" ON)
 find_package(OpenGeode REQUIRED)
 find_package(assimp REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${ASSIMP_INSTALL_PREFIX})
 find_package(pugixml REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${PUGIXML_INSTALL_PREFIX})
+find_package(zlib REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${ZLIB_INSTALL_PREFIX})
 
 # Install OpenGeode-IO third-parties
 install(
@@ -41,8 +42,6 @@ install(
 # Configure the OpenGeode-IO libraries
 add_subdirectory(src/geode)
 
-add_subdirectory(${ZLIB_PATH}/src/zlib)
-
 #------------------------------------------------------------------------------------------------
 # Optional modules configuration
 if(OPENGEODE_IO_WITH_TESTS)

src/geode/io/mesh/CMakeLists.txt

@@ -49,5 +49,5 @@ add_geode_library(
         OpenGeode::mesh
         assimp::assimp
         pugixml::pugixml
-        zlib
+        zlib::zlibstatic
 )

tests/mesh/test-vtp.cpp

@@ -54,7 +54,7 @@ void run_test( absl::string_view filename,
     check( *surface, test_answers );
 
     // Save file
-    auto filename_without_ext{ filename };
+    absl::string_view filename_without_ext{ filename };
     filename_without_ext.remove_suffix( 4 );
     const auto output_filename =
         absl::StrCat( filename_without_ext, ".", surface->native_extension() );