Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deps/Blosc/Blosc.cmake26
-rw-r--r--deps/Blosc/blosc-mods.patch (renamed from deps/blosc-mods.patch)0
-rw-r--r--deps/CMakeLists.txt21
-rw-r--r--deps/OpenEXR/OpenEXR.cmake15
-rw-r--r--deps/OpenVDB/OpenVDB.cmake38
-rw-r--r--deps/OpenVDB/openvdb-mods.patch (renamed from deps/openvdb-mods.patch)0
-rw-r--r--deps/deps-linux.cmake3
-rw-r--r--deps/deps-macos.cmake92
-rw-r--r--deps/deps-unix-common.cmake104
-rw-r--r--deps/deps-windows.cmake161
10 files changed, 270 insertions, 190 deletions
diff --git a/deps/Blosc/Blosc.cmake b/deps/Blosc/Blosc.cmake
new file mode 100644
index 000000000..08895019f
--- /dev/null
+++ b/deps/Blosc/Blosc.cmake
@@ -0,0 +1,26 @@
+if(BUILD_SHARED_LIBS)
+ set(_build_shared ON)
+ set(_build_static OFF)
+else()
+ set(_build_shared OFF)
+ set(_build_static ON)
+endif()
+
+prusaslicer_add_cmake_project(Blosc
+ GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
+ GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0
+ DEPENDS ${ZLIB_PKG}
+ PATCH_COMMAND ${GIT_EXECUTABLE} reset --hard && ${GIT_EXECUTABLE} clean -df &&
+ ${GIT_EXECUTABLE} apply --whitespace=nowarn ${CMAKE_CURRENT_LIST_DIR}/blosc-mods.patch
+ CMAKE_ARGS
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+ -DBUILD_SHARED=${_build_shared}
+ -DBUILD_STATIC=${_build_static}
+ -DBUILD_TESTS=OFF
+ -DBUILD_BENCHMARKS=OFF
+ -DPREFER_EXTERNAL_ZLIB=ON
+)
+
+if (MSVC)
+ add_debug_dep(dep_Blosc)
+endif () \ No newline at end of file
diff --git a/deps/blosc-mods.patch b/deps/Blosc/blosc-mods.patch
index 9b1b9cb27..9b1b9cb27 100644
--- a/deps/blosc-mods.patch
+++ b/deps/Blosc/blosc-mods.patch
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index d652cce1f..a4b6268db 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -146,25 +146,30 @@ if (NOT EXPAT_FOUND)
set(EXPAT_PKG dep_EXPAT)
endif ()
+# The order of includes respects the dependencies between libraries
include(Cereal/Cereal.cmake)
include(Qhull/Qhull.cmake)
include(GLEW/GLEW.cmake)
include(OpenCSG/OpenCSG.cmake)
+
+include(TBB/TBB.cmake)
+
+include(Blosc/Blosc.cmake)
+include(OpenEXR/OpenEXR.cmake)
+include(OpenVDB/OpenVDB.cmake)
+
include(GMP/GMP.cmake)
include(MPFR/MPFR.cmake)
include(CGAL/CGAL.cmake)
+
include(NLopt/NLopt.cmake)
-include(TBB/TBB.cmake)
+
include(OpenSSL/OpenSSL.cmake)
include(CURL/CURL.cmake)
-include(wxWidgets/wxWidgets.cmake)
-if (NOT "${ZLIB_PKG}" STREQUAL "")
- add_dependencies(dep_blosc ${ZLIB_PKG})
- add_dependencies(dep_openexr ${ZLIB_PKG})
-endif ()
+include(wxWidgets/wxWidgets.cmake)
-add_dependencies(dep_openvdb dep_TBB)
+add_dependencies(dep_OpenVDB dep_boost)
set(_dep_list
dep_boost
@@ -173,7 +178,7 @@ set(_dep_list
dep_wxWidgets
dep_Cereal
dep_NLopt
- dep_openvdb
+ dep_OpenVDB
dep_OpenCSG
dep_CGAL
${PNG_PKG}
diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
new file mode 100644
index 000000000..3e1c1ee0a
--- /dev/null
+++ b/deps/OpenEXR/OpenEXR.cmake
@@ -0,0 +1,15 @@
+prusaslicer_add_cmake_project(OpenEXR
+ GIT_REPOSITORY https://github.com/openexr/openexr.git
+ DEPENDS ${ZLIB_PKG}
+ GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0
+ CMAKE_ARGS
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+ -DBUILD_TESTING=OFF
+ -DPYILMBASE_ENABLE:BOOL=OFF
+ -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
+ -DOPENEXR_BUILD_UTILS:BOOL=OFF
+)
+
+if (MSVC)
+ add_debug_dep(dep_OpenEXR)
+endif () \ No newline at end of file
diff --git a/deps/OpenVDB/OpenVDB.cmake b/deps/OpenVDB/OpenVDB.cmake
new file mode 100644
index 000000000..452c404cd
--- /dev/null
+++ b/deps/OpenVDB/OpenVDB.cmake
@@ -0,0 +1,38 @@
+if(BUILD_SHARED_LIBS)
+ set(_build_shared ON)
+ set(_build_static OFF)
+else()
+ set(_build_shared OFF)
+ set(_build_static ON)
+endif()
+
+prusaslicer_add_cmake_project(OpenVDB
+ GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb.git
+ GIT_TAG aebaf8d95be5e57fd33949281ec357db4a576c2e #v6.2.1
+ DEPENDS dep_TBB dep_Blosc dep_OpenEXR #dep_Boost
+ PATCH_COMMAND ${GIT_EXECUTABLE} reset --hard && ${GIT_EXECUTABLE} clean -df &&
+ ${GIT_EXECUTABLE} apply --whitespace=nowarn ${CMAKE_CURRENT_LIST_DIR}/openvdb-mods.patch
+ CMAKE_ARGS
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+ -DOPENVDB_BUILD_PYTHON_MODULE=OFF
+ -DUSE_BLOSC=ON
+ -DOPENVDB_CORE_SHARED=${_build_shared}
+ -DOPENVDB_CORE_STATIC=${_build_static}
+ -DOPENVDB_ENABLE_RPATH:BOOL=OFF
+ -DTBB_STATIC=${_build_static}
+ -DOPENVDB_BUILD_VDB_PRINT=ON
+ -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON # Centos6 has old zlib
+)
+
+if (MSVC)
+ if (${DEP_DEBUG})
+ ExternalProject_Get_Property(dep_OpenVDB BINARY_DIR)
+ ExternalProject_Add_Step(dep_OpenVDB build_debug
+ DEPENDEES build
+ DEPENDERS install
+ COMMAND ${CMAKE_COMMAND} ../dep_OpenVDB -DOPENVDB_BUILD_VDB_PRINT=OFF
+ COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj
+ WORKING_DIRECTORY "${BINARY_DIR}"
+ )
+ endif ()
+endif () \ No newline at end of file
diff --git a/deps/openvdb-mods.patch b/deps/OpenVDB/openvdb-mods.patch
index d80d0ffde..d80d0ffde 100644
--- a/deps/openvdb-mods.patch
+++ b/deps/OpenVDB/openvdb-mods.patch
diff --git a/deps/deps-linux.cmake b/deps/deps-linux.cmake
index c62ff943f..9669daadb 100644
--- a/deps/deps-linux.cmake
+++ b/deps/deps-linux.cmake
@@ -100,6 +100,3 @@ ExternalProject_Add(dep_boost
# BUILD_COMMAND make "-j${NPROC}"
# INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
# )
-
-add_dependencies(dep_openvdb dep_boost)
-
diff --git a/deps/deps-macos.cmake b/deps/deps-macos.cmake
index de77dafa8..469334783 100644
--- a/deps/deps-macos.cmake
+++ b/deps/deps-macos.cmake
@@ -42,50 +42,50 @@ ExternalProject_Add(dep_boost
INSTALL_COMMAND "" # b2 does that already
)
-ExternalProject_Add(dep_libcurl
- EXCLUDE_FROM_ALL 1
- URL "https://curl.haxx.se/download/curl-7.58.0.tar.gz"
- URL_HASH SHA256=cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ./configure
- --enable-static
- --disable-shared
- "--with-ssl=${DESTDIR}/usr/local"
- --with-pic
- --enable-ipv6
- --enable-versioned-symbols
- --enable-threaded-resolver
- --with-darwinssl
- --without-ssl # disables OpenSSL
- --disable-ldap
- --disable-ldaps
- --disable-manual
- --disable-rtsp
- --disable-dict
- --disable-telnet
- --disable-pop3
- --disable-imap
- --disable-smb
- --disable-smtp
- --disable-gopher
- --without-gssapi
- --without-libpsl
- --without-libidn2
- --without-gnutls
- --without-polarssl
- --without-mbedtls
- --without-cyassl
- --without-nss
- --without-axtls
- --without-brotli
- --without-libmetalink
- --without-libssh
- --without-libssh2
- --without-librtmp
- --without-nghttp2
- --without-zsh-functions-dir
- BUILD_COMMAND make "-j${NPROC}"
- INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
-)
-add_dependencies(dep_openvdb dep_boost)
+# ExternalProject_Add(dep_libcurl
+# EXCLUDE_FROM_ALL 1
+# URL "https://curl.haxx.se/download/curl-7.58.0.tar.gz"
+# URL_HASH SHA256=cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115
+# BUILD_IN_SOURCE 1
+# CONFIGURE_COMMAND ./configure
+# --enable-static
+# --disable-shared
+# "--with-ssl=${DESTDIR}/usr/local"
+# --with-pic
+# --enable-ipv6
+# --enable-versioned-symbols
+# --enable-threaded-resolver
+# --with-darwinssl
+# --without-ssl # disables OpenSSL
+# --disable-ldap
+# --disable-ldaps
+# --disable-manual
+# --disable-rtsp
+# --disable-dict
+# --disable-telnet
+# --disable-pop3
+# --disable-imap
+# --disable-smb
+# --disable-smtp
+# --disable-gopher
+# --without-gssapi
+# --without-libpsl
+# --without-libidn2
+# --without-gnutls
+# --without-polarssl
+# --without-mbedtls
+# --without-cyassl
+# --without-nss
+# --without-axtls
+# --without-brotli
+# --without-libmetalink
+# --without-libssh
+# --without-libssh2
+# --without-librtmp
+# --without-nghttp2
+# --without-zsh-functions-dir
+# BUILD_COMMAND make "-j${NPROC}"
+# INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
+# )
+# add_dependencies(dep_openvdb dep_boost) \ No newline at end of file
diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake
index 8c0037631..0b36dbcc2 100644
--- a/deps/deps-unix-common.cmake
+++ b/deps/deps-unix-common.cmake
@@ -40,57 +40,57 @@ endif ()
# ${DEP_CMAKE_OPTS}
# )
-ExternalProject_Add(dep_blosc
- EXCLUDE_FROM_ALL 1
- GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
- GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0
- DEPENDS
- CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
- -DBUILD_SHARED_LIBS=OFF
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DCMAKE_DEBUG_POSTFIX=d
- -DBUILD_SHARED=OFF
- -DBUILD_STATIC=ON
- -DBUILD_TESTS=OFF
- -DBUILD_BENCHMARKS=OFF
- -DPREFER_EXTERNAL_ZLIB=ON
- PATCH_COMMAND ${GIT_EXECUTABLE} reset --hard && git clean -df &&
- ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch
-)
+# ExternalProject_Add(dep_blosc
+# EXCLUDE_FROM_ALL 1
+# GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
+# GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0
+# DEPENDS
+# CMAKE_ARGS
+# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
+# -DBUILD_SHARED_LIBS=OFF
+# -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+# -DCMAKE_DEBUG_POSTFIX=d
+# -DBUILD_SHARED=OFF
+# -DBUILD_STATIC=ON
+# -DBUILD_TESTS=OFF
+# -DBUILD_BENCHMARKS=OFF
+# -DPREFER_EXTERNAL_ZLIB=ON
+# PATCH_COMMAND ${GIT_EXECUTABLE} reset --hard && git clean -df &&
+# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch
+# )
-ExternalProject_Add(dep_openexr
- EXCLUDE_FROM_ALL 1
- GIT_REPOSITORY https://github.com/openexr/openexr.git
- GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0
- CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
- -DBUILD_SHARED_LIBS=OFF
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DBUILD_TESTING=OFF
- -DPYILMBASE_ENABLE:BOOL=OFF
- -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
- -DOPENEXR_BUILD_UTILS:BOOL=OFF
-)
+# ExternalProject_Add(dep_openexr
+# EXCLUDE_FROM_ALL 1
+# GIT_REPOSITORY https://github.com/openexr/openexr.git
+# GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0
+# CMAKE_ARGS
+# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
+# -DBUILD_SHARED_LIBS=OFF
+# -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+# -DBUILD_TESTING=OFF
+# -DPYILMBASE_ENABLE:BOOL=OFF
+# -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
+# -DOPENEXR_BUILD_UTILS:BOOL=OFF
+# )
-ExternalProject_Add(dep_openvdb
- EXCLUDE_FROM_ALL 1
- GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb.git
- GIT_TAG aebaf8d95be5e57fd33949281ec357db4a576c2e #v6.2.1
- DEPENDS dep_blosc dep_openexr
- CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
- -DCMAKE_DEBUG_POSTFIX=d
- -DCMAKE_PREFIX_PATH=${DESTDIR}/usr/local
- -DBUILD_SHARED_LIBS=OFF
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DOPENVDB_BUILD_PYTHON_MODULE=OFF
- -DUSE_BLOSC=ON
- -DOPENVDB_CORE_SHARED=OFF
- -DOPENVDB_CORE_STATIC=ON
- -DTBB_STATIC=ON
- -DOPENVDB_BUILD_VDB_PRINT=ON
- -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON
- PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
- ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/openvdb-mods.patch
-)
+# ExternalProject_Add(dep_openvdb
+# EXCLUDE_FROM_ALL 1
+# GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb.git
+# GIT_TAG aebaf8d95be5e57fd33949281ec357db4a576c2e #v6.2.1
+# DEPENDS dep_blosc dep_openexr
+# CMAKE_ARGS
+# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
+# -DCMAKE_DEBUG_POSTFIX=d
+# -DCMAKE_PREFIX_PATH=${DESTDIR}/usr/local
+# -DBUILD_SHARED_LIBS=OFF
+# -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+# -DOPENVDB_BUILD_PYTHON_MODULE=OFF
+# -DUSE_BLOSC=ON
+# -DOPENVDB_CORE_SHARED=OFF
+# -DOPENVDB_CORE_STATIC=ON
+# -DTBB_STATIC=ON
+# -DOPENVDB_BUILD_VDB_PRINT=ON
+# -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON
+# PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
+# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/openvdb-mods.patch
+# )
diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake
index 9b506dcc1..78315152f 100644
--- a/deps/deps-windows.cmake
+++ b/deps/deps-windows.cmake
@@ -156,89 +156,88 @@ endif ()
find_package(Git REQUIRED)
-ExternalProject_Add(dep_blosc
- EXCLUDE_FROM_ALL 1
- #URL https://github.com/Blosc/c-blosc/archive/v1.17.0.zip
- #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
- GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
- GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0
- CMAKE_GENERATOR "${DEP_MSVC_GEN}"
- CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
- CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
- -DBUILD_SHARED_LIBS=OFF
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DCMAKE_DEBUG_POSTFIX=d
- -DBUILD_SHARED=OFF
- -DBUILD_STATIC=ON
- -DBUILD_TESTS=OFF
- -DBUILD_BENCHMARKS=OFF
- -DPREFER_EXTERNAL_ZLIB=ON
- -DBLOSC_IS_SUBPROJECT:BOOL=ON
- -DBLOSC_INSTALL:BOOL=ON
- PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
- ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch
- BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
- INSTALL_COMMAND ""
-)
-
-add_debug_dep(dep_blosc)
+# ExternalProject_Add(dep_blosc
+# EXCLUDE_FROM_ALL 1
+# #URL https://github.com/Blosc/c-blosc/archive/v1.17.0.zip
+# #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
+# GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
+# GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0
+# CMAKE_GENERATOR "${DEP_MSVC_GEN}"
+# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
+# CMAKE_ARGS
+# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
+# -DBUILD_SHARED_LIBS=OFF
+# -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+# -DCMAKE_DEBUG_POSTFIX=d
+# -DBUILD_SHARED=OFF
+# -DBUILD_STATIC=ON
+# -DBUILD_TESTS=OFF
+# -DBUILD_BENCHMARKS=OFF
+# -DPREFER_EXTERNAL_ZLIB=ON
+# -DBLOSC_IS_SUBPROJECT:BOOL=ON
+# -DBLOSC_INSTALL:BOOL=ON
+# PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
+# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch
+# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
+# INSTALL_COMMAND ""
+# )
-ExternalProject_Add(dep_openexr
- EXCLUDE_FROM_ALL 1
- GIT_REPOSITORY https://github.com/openexr/openexr.git
- GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0
- CMAKE_GENERATOR "${DEP_MSVC_GEN}"
- CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
- CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
- -DBUILD_SHARED_LIBS=OFF
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DBUILD_TESTING=OFF
- -DPYILMBASE_ENABLE:BOOL=OFF
- -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
- -DOPENEXR_BUILD_UTILS:BOOL=OFF
- BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
- INSTALL_COMMAND ""
-)
+# add_debug_dep(dep_blosc)
-add_debug_dep(dep_openexr)
+# ExternalProject_Add(dep_openexr
+# EXCLUDE_FROM_ALL 1
+# GIT_REPOSITORY https://github.com/openexr/openexr.git
+# GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0
+# CMAKE_GENERATOR "${DEP_MSVC_GEN}"
+# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
+# CMAKE_ARGS
+# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
+# -DBUILD_SHARED_LIBS=OFF
+# -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+# -DBUILD_TESTING=OFF
+# -DPYILMBASE_ENABLE:BOOL=OFF
+# -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
+# -DOPENEXR_BUILD_UTILS:BOOL=OFF
+# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
+# INSTALL_COMMAND ""
+# )
-ExternalProject_Add(dep_openvdb
- EXCLUDE_FROM_ALL 1
- #URL https://github.com/AcademySoftwareFoundation/openvdb/archive/v6.2.1.zip
- #URL_HASH SHA256=dc337399dce8e1c9f21f20e97b1ce7e4933cb0a63bb3b8b734d8fcc464aa0c48
- GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb.git
- GIT_TAG aebaf8d95be5e57fd33949281ec357db4a576c2e #v6.2.1
- DEPENDS dep_blosc dep_openexr dep_tbb dep_boost
- CMAKE_GENERATOR "${DEP_MSVC_GEN}"
- CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
- CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
- -DCMAKE_DEBUG_POSTFIX=d
- -DCMAKE_PREFIX_PATH=${DESTDIR}/usr/local
- -DBUILD_SHARED_LIBS=OFF
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DOPENVDB_BUILD_PYTHON_MODULE=OFF
- -DUSE_BLOSC=ON
- -DOPENVDB_CORE_SHARED=OFF
- -DOPENVDB_CORE_STATIC=ON
- -DTBB_STATIC=ON
- -DOPENVDB_BUILD_VDB_PRINT=ON
- BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
- PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
- ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/openvdb-mods.patch
- INSTALL_COMMAND ""
-)
+# add_debug_dep(dep_openexr)
-if (${DEP_DEBUG})
- ExternalProject_Get_Property(dep_openvdb BINARY_DIR)
- ExternalProject_Add_Step(dep_openvdb build_debug
- DEPENDEES build
- DEPENDERS install
- COMMAND ${CMAKE_COMMAND} ../dep_openvdb -DOPENVDB_BUILD_VDB_PRINT=OFF
- COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj
- WORKING_DIRECTORY "${BINARY_DIR}"
- )
-endif ()
+# ExternalProject_Add(dep_openvdb
+# EXCLUDE_FROM_ALL 1
+# #URL https://github.com/AcademySoftwareFoundation/openvdb/archive/v6.2.1.zip
+# #URL_HASH SHA256=dc337399dce8e1c9f21f20e97b1ce7e4933cb0a63bb3b8b734d8fcc464aa0c48
+# GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb.git
+# GIT_TAG aebaf8d95be5e57fd33949281ec357db4a576c2e #v6.2.1
+# DEPENDS dep_blosc dep_openexr dep_tbb dep_boost
+# CMAKE_GENERATOR "${DEP_MSVC_GEN}"
+# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
+# CMAKE_ARGS
+# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
+# -DCMAKE_DEBUG_POSTFIX=d
+# -DCMAKE_PREFIX_PATH=${DESTDIR}/usr/local
+# -DBUILD_SHARED_LIBS=OFF
+# -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+# -DOPENVDB_BUILD_PYTHON_MODULE=OFF
+# -DUSE_BLOSC=ON
+# -DOPENVDB_CORE_SHARED=OFF
+# -DOPENVDB_CORE_STATIC=ON
+# -DTBB_STATIC=ON
+# -DOPENVDB_BUILD_VDB_PRINT=ON
+# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
+# PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
+# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/openvdb-mods.patch
+# INSTALL_COMMAND ""
+# )
+# if (${DEP_DEBUG})
+# ExternalProject_Get_Property(dep_openvdb BINARY_DIR)
+# ExternalProject_Add_Step(dep_openvdb build_debug
+# DEPENDEES build
+# DEPENDERS install
+# COMMAND ${CMAKE_COMMAND} ../dep_openvdb -DOPENVDB_BUILD_VDB_PRINT=OFF
+# COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj
+# WORKING_DIRECTORY "${BINARY_DIR}"
+# )
+# endif () \ No newline at end of file