[Bf-blender-cvs] [1999651da5c] master: makesrna: Fix windows build.
Ray Molenkamp
noreply at git.blender.org
Thu Feb 21 18:03:03 CET 2019
Commit: 1999651da5c1bc8cda4d56c88867d0222ec57e3a
Author: Ray Molenkamp
Date: Thu Feb 21 10:02:54 2019 -0700
Branches: master
https://developer.blender.org/rB1999651da5c1bc8cda4d56c88867d0222ec57e3a
makesrna: Fix windows build.
makesrna requires the pthread dll to be available before it can run.
===================================================================
M source/blender/makesrna/intern/CMakeLists.txt
===================================================================
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 255220245e0..5dc372bf8c1 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -375,3 +375,11 @@ 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