Skip to content

Commit 97c1eb5

Browse files
panquezpanquez
authored
Merge pull request #967 from Geode-solutions/fix_v15/solid_mesh_missing_include_and_bitsery_git_tag_change
Fix_v15/solid_mesh_missing_include_and_bitsery_git_tag_change
2 parents aab15f6 + 9a234e6 commit 97c1eb5

39 files changed

+313
-371
lines changed

‎bindings/python/src/common.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,5 @@ namespace pybind11
7676
: string_caster< absl::string_view, true >
7777
{
7878
};
79-
8079
} // namespace detail
8180
} // namespace pybind11

‎cmake/ConfigureAbseil.cmake‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ExternalProject_Add(abseil
2626
BINARY_DIR ${ABSEIL_PATH}/build
2727
STAMP_DIR ${ABSEIL_PATH}/stamp
2828
GIT_REPOSITORY https://github.com/Geode-solutions/abseil-cpp
29-
GIT_TAG 20240621
29+
GIT_TAG 20240710
3030
GIT_SHALLOW ON
3131
GIT_PROGRESS ON
3232
CMAKE_GENERATOR ${CMAKE_GENERATOR}
@@ -36,14 +36,12 @@ ExternalProject_Add(abseil
3636
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
3737
-DCMAKE_INSTALL_MESSAGE=LAZY
3838
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
39+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
3940
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW
4041
-DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=${CMAKE_MSVC_RUNTIME_LIBRARY}
4142
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
42-
-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
43-
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
44-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
45-
CMAKE_CACHE_ARGS
4643
-DCMAKE_INSTALL_PREFIX:PATH=${ABSEIL_INSTALL_PREFIX}
44+
-DABSL_BUILD_TESTING:BOOL=OFF
4745
)
4846

4947
ExternalProject_Add_StepTargets(abseil download)

‎cmake/ConfigureAsync++.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ ExternalProject_Add(asyncplusplus
3939
-DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=${CMAKE_MSVC_RUNTIME_LIBRARY}
4040
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
4141
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
42-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
4342
CMAKE_CACHE_ARGS
4443
-DCMAKE_INSTALL_PREFIX:PATH=${ASYNCPLUSPLUS_INSTALL_PREFIX}
4544
)

‎cmake/ConfigureBitsery.cmake‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@ ExternalProject_Add(bitsery
2626
BINARY_DIR ${BITSERY_PATH}/build
2727
STAMP_DIR ${BITSERY_PATH}/stamp
2828
GIT_REPOSITORY https://github.com/Geode-solutions/bitsery
29-
GIT_TAG bf5d1fb305b86730021418df572228f60369f499
29+
GIT_TAG 4292ba7645f15f3870914f4ecbbacd499c6924ac
3030
GIT_PROGRESS ON
3131
CMAKE_GENERATOR ${CMAKE_GENERATOR}
3232
CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
3333
CMAKE_ARGS
3434
-DCMAKE_INSTALL_MESSAGE=LAZY
3535
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
36-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
3736
CMAKE_CACHE_ARGS
3837
-DCMAKE_INSTALL_PREFIX:PATH=${BITSERY_INSTALL_PREFIX}
3938
)

‎cmake/ConfigureFilesystem.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ ExternalProject_Add(ghcFilesystem
3434
CMAKE_ARGS
3535
-DCMAKE_INSTALL_MESSAGE=LAZY
3636
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
37-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
3837
CMAKE_CACHE_ARGS
3938
-DGHC_FILESYSTEM_BUILD_TESTING:BOOL=OFF
4039
-DGHC_FILESYSTEM_BUILD_EXAMPLES:BOOL=OFF

‎cmake/ConfigureGDAL.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ExternalProject_Add(gdal
4242
-DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=${CMAKE_MSVC_RUNTIME_LIBRARY}
4343
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
4444
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
45-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
4645
CMAKE_CACHE_ARGS
4746
-DCMAKE_INSTALL_PREFIX:PATH=${GDAL_INSTALL_PREFIX}
4847
-DCMAKE_PREFIX_PATH:PATH=${GDAL_CMAKE_PREFIX_PATH}

‎cmake/ConfigureMinizip.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ ExternalProject_Add(minizip
3535
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
3636
-DCMAKE_INSTALL_MESSAGE=LAZY
3737
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
38-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
3938
CMAKE_CACHE_ARGS
4039
-DMZ_COMPAT:BOOL=OFF
4140
-DMZ_ZLIB:BOOL=OFF

‎cmake/ConfigureNanoflann.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ ExternalProject_Add(nanoflann
3636
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
3737
-DCMAKE_INSTALL_MESSAGE=LAZY
3838
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
39-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
4039
CMAKE_CACHE_ARGS
4140
-DBUILD_EXAMPLES:BOOL=OFF
4241
-DBUILD_TESTS:BOOL=OFF

‎cmake/ConfigurePROJ.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ ExternalProject_Add(proj
4040
-DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=${CMAKE_MSVC_RUNTIME_LIBRARY}
4141
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
4242
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
43-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
4443
CMAKE_CACHE_ARGS
4544
-DCMAKE_INSTALL_PREFIX:PATH=${PROJ_INSTALL_PREFIX}
4645
-DCMAKE_PREFIX_PATH:PATH=${SQLITE_INSTALL_PREFIX}

‎cmake/ConfigurePybind11.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ ExternalProject_Add(pybind11
3636
-DCMAKE_INSTALL_MESSAGE=LAZY
3737
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
3838
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
39-
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION}
4039
CMAKE_CACHE_ARGS
4140
-DPYBIND11_PYTHON_VERSION:STRING=${PYTHON_VERSION}
4241
-DPYBIND11_INSTALL:BOOL=ON

0 commit comments

Comments
 (0)