diff options
| -rw-r--r-- | deps/deps-linux.cmake | 14 | ||||
| -rw-r--r-- | deps/deps-unix-common.cmake | 3 | ||||
| -rw-r--r-- | deps/deps-windows.cmake | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/deps/deps-linux.cmake b/deps/deps-linux.cmake index 209cc3fd4..368ea1fc1 100644 --- a/deps/deps-linux.cmake +++ b/deps/deps-linux.cmake @@ -88,19 +88,17 @@ ExternalProject_Add(dep_libcurl ) if (DEP_WX_STABLE) - set(DEP_WX_URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2") - set(DEP_WX_HASH "SHA256=96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0") + set(DEP_WX_TAG "v3.0.4") else () - set(DEP_WX_URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2") - set(DEP_WX_HASH "SHA256=c925dfe17e8f8b09eb7ea9bfdcfcc13696a3e14e92750effd839f5e10726159e") + set(DEP_WX_TAG "v3.1.1-patched") endif() ExternalProject_Add(dep_wxwidgets EXCLUDE_FROM_ALL 1 - URL "${DEP_WX_URL}" - URL_HASH "${DEP_WX_HASH}" + GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets" + GIT_TAG "${DEP_WX_TAG}" BUILD_IN_SOURCE 1 - PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/wxwidgets-pngprefix.h" src/png/pngprefix.h + # PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/wxwidgets-pngprefix.h" src/png/pngprefix.h CONFIGURE_COMMAND ./configure "--prefix=${DESTDIR}/usr/local" --disable-shared @@ -124,4 +122,4 @@ ExternalProject_Add(dep_wxwidgets INSTALL_COMMAND make install ) -add_dependencies(dep_openvdb dep_boost)
\ No newline at end of file +add_dependencies(dep_openvdb dep_boost) diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake index 7491aafe1..b6e6653cd 100644 --- a/deps/deps-unix-common.cmake +++ b/deps/deps-unix-common.cmake @@ -115,6 +115,7 @@ ExternalProject_Add(dep_openvdb -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 -)
\ No newline at end of file +) diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index 603f24931..276129a8d 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -353,4 +353,4 @@ if (${DEP_DEBUG}) COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj WORKING_DIRECTORY "${BINARY_DIR}" ) -endif ()
\ No newline at end of file +endif () |