Commit: 8ed6985017a6eae95530927eb386a0c42ae4d1e9
Author: Ray Molenkamp
Date: Thu Feb 21 14:16:26 2019 -0700
Branches: master
https://developer.blender.org/rB8ed6985017a6eae95530927eb386a0c42ae4d1e9
Windows: Use static pthreads library.
===================================================================
M build_files/build_environment/cmake/pthreads.cmake
M source/creator/CMakeLists.txt
===================================================================
diff --git a/build_files/build_environment/cmake/pthreads.cmake
b/build_files/build_environment/cmake/pthreads.cmake
index 364ccb6cefe..8d605973fa5 100644
--- a/build_files/build_environment/cmake/pthreads.cmake
+++ b/build_files/build_environment/cmake/pthreads.cmake
@@ -17,7 +17,6 @@
# ***** END GPL LICENSE BLOCK *****
if(WIN32)
- set(PTHREAD_XCFLAGS /MD)
if(MSVC14) # vs2015 has timespec
set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H
/D_TIMESPEC_DEFINED ")
@@ -25,7 +24,7 @@ if(WIN32)
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)
+ set(PTHREADS_BUILD cd
${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e
CPPFLAGS=${PTHREAD_CPPFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
ExternalProject_Add(external_pthreads
URL ${PTHREADS_URI}
@@ -35,8 +34,7 @@ if(WIN32)
CONFIGURE_COMMAND echo .
BUILD_COMMAND ${PTHREADS_BUILD}
INSTALL_COMMAND COMMAND
- ${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/libpthreadVC3${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 &&
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index ea90b900dfd..ce9bb24a66f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -772,13 +772,6 @@ elseif(WIN32)
endif()
endif()
- if(MSVC)
- install(
- FILES ${LIBDIR}/pthreads/lib/pthreadVC3.dll
- DESTINATION "."
- )
- endif()
-
if(WITH_CODEC_FFMPEG)
install(
FILES
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
