Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Tue, 11 Dec 2018 22:14:00 +0000 (15:14 -0700)
committerRay Molenkamp <github@lazydodo.com>
Tue, 11 Dec 2018 22:14:00 +0000 (15:14 -0700)
build_files/build_environment/cmake/blosc.cmake
build_files/build_environment/cmake/openvdb.cmake
build_files/build_environment/cmake/pthreads.cmake
build_files/build_environment/cmake/versions.cmake
build_files/cmake/platform/platform_win32.cmake
source/creator/CMakeLists.txt

index 18f2583..1cbf970 100644 (file)
@@ -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
index ccdc00e..11456fa 100644 (file)
@@ -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}
index 66246c5..364ccb6 100644 (file)
@@ -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
                )
 
index 3b4b5da..29c9c2d 100644 (file)
@@ -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)
index 5eeda2d..04ab2ae 100644 (file)
@@ -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
index 7d382b0..c5bd0f8 100644 (file)
@@ -779,7 +779,7 @@ elseif(WIN32)
 
        if(MSVC)
                install(
-                       FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll
+                       FILES ${LIBDIR}/pthreads/lib/pthreadVC3.dll
                        DESTINATION "."
                )
        endif()