[Bf-blender-cvs] [4d4ae491c80] master: makesrna: Remove usage of dynamically linked pthreads4w
Ray Molenkamp
noreply at git.blender.org
Thu Feb 21 22:21:46 CET 2019
Commit: 4d4ae491c8098001700c23b805f7514fd56941f3
Author: Ray Molenkamp
Date: Thu Feb 21 14:21:31 2019 -0700
Branches: master
https://developer.blender.org/rB4d4ae491c8098001700c23b805f7514fd56941f3
makesrna: Remove usage of dynamically linked pthreads4w
With pthreads now being static, there is no more reason to copy the dll.
===================================================================
M source/blender/makesrna/intern/CMakeLists.txt
===================================================================
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 5dc372bf8c1..255220245e0 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -375,11 +375,3 @@ set(SRC
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}")
-
-#makesrna needs the prhreads dll to properly run on windows
-if(WIN32)
- ADD_CUSTOM_COMMAND(TARGET bf_rna
- PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pthreads/lib/pthreadVC3.dll $<TARGET_FILE_DIR:makesrna>/
- )
-endif()
More information about the Bf-blender-cvs
mailing list