Merge pull request #971 from Geode-solutions/fix/deps-v15

feat(Build): add install symlink into build

Author: panquez

cmake/ConfigureAsync++.cmake

@@ -25,8 +25,9 @@ ExternalProject_Add(asyncplusplus
     SOURCE_DIR ${ASYNCPLUSPLUS_PATH}/src
     BINARY_DIR ${ASYNCPLUSPLUS_PATH}/build
     STAMP_DIR ${ASYNCPLUSPLUS_PATH}/stamp
-    GIT_REPOSITORY https://github.com/Amanieu/asyncplusplus
-    GIT_TAG 756893feb9e69c098225d5a454a668a2c139e4be
+    GIT_REPOSITORY https://github.com/Geode-solutions/asyncplusplus
+    GIT_TAG 20240711
+    GIT_SHALLOW ON
     GIT_PROGRESS ON
     CMAKE_GENERATOR ${CMAKE_GENERATOR}
     CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}

cmake/ConfigureBitsery.cmake

@@ -26,7 +26,8 @@ ExternalProject_Add(bitsery
     BINARY_DIR ${BITSERY_PATH}/build
     STAMP_DIR ${BITSERY_PATH}/stamp
     GIT_REPOSITORY https://github.com/Geode-solutions/bitsery
-    GIT_TAG 4292ba7645f15f3870914f4ecbbacd499c6924ac
+    GIT_TAG 20240711
+    GIT_SHALLOW ON
     GIT_PROGRESS ON
     CMAKE_GENERATOR ${CMAKE_GENERATOR}
     CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}

cmake/ConfigureMinizip.cmake

@@ -25,15 +25,17 @@ ExternalProject_Add(minizip
     SOURCE_DIR ${MINIZIP_PATH}/src
     BINARY_DIR ${MINIZIP_PATH}/build
     STAMP_DIR ${MINIZIP_PATH}/stamp
-    GIT_REPOSITORY https://github.com/nmoinvaz/minizip
-    GIT_TAG f3d400e999056ca290998b3fd89cc5a74e4b8b58
+    GIT_REPOSITORY https://github.com/zlib-ng/minizip-ng
+    GIT_TAG 4.0.7
+    GIT_SHALLOW ON
     GIT_PROGRESS ON
     CMAKE_GENERATOR ${CMAKE_GENERATOR}
     CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
     CMAKE_ARGS
         -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_MESSAGE=LAZY
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
         -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
     CMAKE_CACHE_ARGS
         -DMZ_COMPAT:BOOL=OFF

cmake/ConfigureNanoflann.cmake

@@ -26,7 +26,7 @@ ExternalProject_Add(nanoflann
     BINARY_DIR ${NANOFLANN_PATH}/build
     STAMP_DIR ${NANOFLANN_PATH}/stamp
     GIT_REPOSITORY https://github.com/jlblancoc/nanoflann
-    GIT_TAG v1.3.2
+    GIT_TAG v1.5.5
     GIT_SHALLOW ON
     GIT_PROGRESS ON
     CMAKE_GENERATOR ${CMAKE_GENERATOR}

cmake/ConfigureOpenGeode.cmake

@@ -91,4 +91,15 @@ add_custom_target(download
 )
 if(OPENGEODE_WITH_PYTHON OR INCLUDE_PYBIND11)
     add_dependencies(download pybind11-download)
-endif()
+endif()
+
+add_custom_target(post_install 
+    ALL
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/bin ${PROJECT_BINARY_DIR}/bin
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/lib ${PROJECT_BINARY_DIR}/lib
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/cmake ${PROJECT_BINARY_DIR}/cmake
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/include ${PROJECT_BINARY_DIR}/include
+    DEPENDS
+        opengeode)
+
+install(DIRECTORY ${OpenGeode_PATH_INSTALL}/ DESTINATION .)

cmake/SuperBuild.cmake

@@ -65,8 +65,6 @@ endif()
 
 include(${PROJECT_SOURCE_DIR}/cmake/ConfigureOpenGeode.cmake)
 
-install(DIRECTORY ${OpenGeode_PATH_INSTALL}/ DESTINATION .)
-
 #------------------------------------------------------------------------------------------------
 # Configure CPack
 set(CPACK_PACKAGE_NAME OpenGeode)

src/geode/basic/zip_file.cpp

@@ -57,7 +57,7 @@ namespace geode
         Impl( std::string_view file, std::string_view archive_temp_filename )
         {
             directory_ = create_directory( file, archive_temp_filename );
-            mz_zip_writer_create( &writer_ );
+            writer_ = mz_zip_writer_create();
             mz_zip_writer_set_compress_method(
                 writer_, MZ_COMPRESS_METHOD_STORE );
             const auto status = mz_zip_writer_open_file(
@@ -135,7 +135,7 @@ namespace geode
         Impl( std::string_view file, std::string_view unarchive_temp_filename )
         {
             directory_ = create_directory( file, unarchive_temp_filename );
-            mz_zip_reader_create( &reader_ );
+            reader_ = mz_zip_reader_create();
             const auto status =
                 mz_zip_reader_open_file( reader_, to_string( file ).c_str() );
             OPENGEODE_EXCEPTION(
@@ -199,8 +199,7 @@ namespace geode
 
     bool is_zip_file( std::string_view file )
     {
-        void* reader{ nullptr };
-        mz_zip_reader_create( &reader );
+        void* reader = mz_zip_reader_create();
         const auto status =
             mz_zip_reader_open_file( reader, to_string( file ).c_str() );
         mz_zip_reader_close( reader );

src/geode/geometry/nn_search.cpp

@@ -60,8 +60,8 @@ namespace geode
             const Point< dimension >& point,
             const double threshold_distance ) const
         {
-            std::vector< std::pair< index_t, double > > results;
-            nanoflann::SearchParams params;
+            std::vector< nanoflann::ResultItem< index_t, double > > results;
+            nanoflann::SearchParameters params;
             params.sorted = true;
             const auto nb_results = nn_tree_.radiusSearch( &copy( point )[0],
                 threshold_distance * threshold_distance, results, params );