From ba8d6ca3dd92eed5d679caa28f5446cd07b8a112 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 11 Dec 2018 15:12:56 -0700 Subject: dependencies windows: Replace pthreads-win32 2.9.1 with pthreads4w 3.0.0 maintenance seems to have stopped for pthreads-win32 --- build_files/build_environment/cmake/blosc.cmake | 2 +- build_files/build_environment/cmake/openvdb.cmake | 2 +- build_files/build_environment/cmake/pthreads.cmake | 14 +++++++------- build_files/build_environment/cmake/versions.cmake | 6 +++--- build_files/cmake/platform/platform_win32.cmake | 2 +- source/creator/CMakeLists.txt | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake index 18f258357c9..1cbf97063c0 100644 --- a/build_files/build_environment/cmake/blosc.cmake +++ b/build_files/build_environment/cmake/blosc.cmake @@ -23,7 +23,7 @@ set(BLOSC_EXTRA_ARGS -DBUILD_BENCHMARKS=OFF -DCMAKE_DEBUG_POSTFIX=_d -DThreads_FOUND=1 - -DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC2.lib + -DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC3.lib -DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc -DDEACTIVATE_SNAPPY=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index ccdc00ee0d8..11456facbb2 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -55,7 +55,7 @@ if(WIN32) # needs to link pthreads due to it being a blosc dependency set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS} -DOPENEXR_NAMESPACE_VERSIONING=OFF - -DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC2.lib + -DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC3.lib ) if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4") set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS} diff --git a/build_files/build_environment/cmake/pthreads.cmake b/build_files/build_environment/cmake/pthreads.cmake index 66246c5ee90..364ccb6cefe 100644 --- a/build_files/build_environment/cmake/pthreads.cmake +++ b/build_files/build_environment/cmake/pthreads.cmake @@ -20,9 +20,9 @@ if(WIN32) set(PTHREAD_XCFLAGS /MD) if(MSVC14) # vs2015 has timespec - set(PTHREAD_CPPFLAGS "/I. /DHAVE_PTW32_CONFIG_H /D_TIMESPEC_DEFINED ") + set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H /D_TIMESPEC_DEFINED ") else() # everything before doesn't - set(PTHREAD_CPPFLAGS "/I. /DHAVE_PTW32_CONFIG_H ") + set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H ") endif() set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XCFLAGS=${PTHREAD_XCFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr) @@ -30,17 +30,17 @@ if(WIN32) ExternalProject_Add(external_pthreads URL ${PTHREADS_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} - URL_HASH SHA512=${PTHREADS_SHA512} + URL_HASH MD5=${PTHREADS_HASH} PREFIX ${BUILD_DIR}/pthreads CONFIGURE_COMMAND echo . - PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff BUILD_COMMAND ${PTHREADS_BUILD} INSTALL_COMMAND COMMAND - ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2.dll ${LIBDIR}/pthreads/lib/pthreadVC2.dll && - ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC2${LIBEXT} && + ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC3.dll ${LIBDIR}/pthreads/lib/pthreadVC3.dll && + ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} && ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h && ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h && - ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h + ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h && + ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/_ptw32.h ${LIBDIR}/pthreads/inc/_ptw32.h INSTALL_DIR ${LIBDIR}/pthreads ) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 3b4b5da26f4..29c9c2d604a 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -41,9 +41,9 @@ set(BLOSC_VERSION 1.14.4) set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz) set(BLOSC_HASH e80dfc71e4cba03b8d01ed0876547ffe) -set(PTHREADS_VERSION 2-9-1) -set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS_VERSION}-release.tar.gz) -set(PTHREADS_SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551) +set(PTHREADS_VERSION 3.0.0) +set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip) +set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653) set(ILMBASE_VERSION 2.3.0) if (WIN32) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 4c15bd6d9ba..85974bc3788 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -225,7 +225,7 @@ if(NOT JPEG_FOUND) endif() set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include) -set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib) +set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC3.lib) set(FREETYPE ${LIBDIR}/freetype) set(FREETYPE_INCLUDE_DIRS diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index fb02a7c871c..a553b8a569b 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -785,7 +785,7 @@ elseif(WIN32) if(MSVC) install( - FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll + FILES ${LIBDIR}/pthreads/lib/pthreadVC3.dll DESTINATION "." ) endif() -- cgit v1.2.3