Fix blenderplayer build after OpenMP changes.
[blender.git] / source / creator / CMakeLists.txt
index d4246d9d7052d65ce62eb03a653e79a812630c9b..1ce8a8d1c4cba3279295d8bb10003bb97c7700e2 100644 (file)
@@ -717,7 +717,7 @@ elseif(WIN32)
                        )
 
                        if(WITH_PYTHON_INSTALL_NUMPY)
-                               set(PYTHON_NUMPY_VERSION 1.13)
+                               set(PYTHON_NUMPY_VERSION 1.15)
                                add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
                                        COMMAND ${CMAKE_COMMAND} -E
                                                make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)
@@ -753,6 +753,19 @@ elseif(WIN32)
                                DESTINATION ${BLENDER_VERSION}/python/bin
                                CONFIGURATIONS Debug
                        )
+                       if(WINDOWS_PYTHON_DEBUG)
+                               install(
+                                       FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.pdb
+                                       DESTINATION "."
+                                       CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+                               )
+
+                               install(
+                                       FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.pdb
+                                       DESTINATION "."
+                                       CONFIGURATIONS Debug
+                               )
+                       endif()
                endif()
 
                unset(_PYTHON_VERSION_NO_DOTS)
@@ -772,7 +785,7 @@ elseif(WIN32)
 
        if(MSVC)
                install(
-                       FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll
+                       FILES ${LIBDIR}/pthreads/lib/pthreadVC3.dll
                        DESTINATION "."
                )
        endif()
@@ -780,12 +793,12 @@ elseif(WIN32)
        if(WITH_CODEC_FFMPEG)
                install(
                        FILES
-                               ${LIBDIR}/ffmpeg/lib/avcodec-57.dll
-                               ${LIBDIR}/ffmpeg/lib/avformat-57.dll
-                               ${LIBDIR}/ffmpeg/lib/avdevice-57.dll
-                               ${LIBDIR}/ffmpeg/lib/avutil-55.dll
-                               ${LIBDIR}/ffmpeg/lib/swscale-4.dll
-                               ${LIBDIR}/ffmpeg/lib/swresample-2.dll
+                               ${LIBDIR}/ffmpeg/lib/avcodec-58.dll
+                               ${LIBDIR}/ffmpeg/lib/avformat-58.dll
+                               ${LIBDIR}/ffmpeg/lib/avdevice-58.dll
+                               ${LIBDIR}/ffmpeg/lib/avutil-56.dll
+                               ${LIBDIR}/ffmpeg/lib/swscale-5.dll
+                               ${LIBDIR}/ffmpeg/lib/swresample-3.dll
                        DESTINATION "."
                )
        endif()
@@ -834,15 +847,6 @@ elseif(WIN32)
                DESTINATION "."
        )
 
-       if(WITH_OPENCOLORIO)
-               set(OCIOBIN ${LIBDIR}/opencolorio/bin)
-                       install(
-                               FILES
-                                       ${OCIOBIN}/OpenColorIO.dll
-                               DESTINATION "."
-                       )
-       endif()
-
 elseif(APPLE)
 
        # handy install macro to exclude files, we use \$ escape for the "to"
@@ -910,6 +914,13 @@ elseif(APPLE)
                blender.app/Contents/
        )
 
+       if(WITH_OPENMP AND OPENMP_CUSTOM)
+               install(
+                       FILES ${LIBDIR}/openmp/lib/libomp.dylib
+                       DESTINATION blender.app/Contents/Resources/lib
+               )
+       endif()
+
        if(WITH_LLVM AND NOT LLVM_STATIC)
                install(
                        FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib
@@ -968,14 +979,13 @@ elseif(APPLE)
                        blenderplayer.app/Contents/
                )
 
-               if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
+               if(WITH_OPENMP AND OPENMP_CUSTOM)
                        install(
-                               FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
-                               DESTINATION blenderplayer.app/Contents/Resources/lib/
+                               FILES ${LIBDIR}/openmp/lib/libomp.dylib
+                               DESTINATION blenderplayer.app/Contents/Resources/lib
                        )
                endif()
 
-
                # python
                if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
                        # Copy the python libs into the install directory
@@ -1040,4 +1050,9 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
                COMPONENT Blender
                DESTINATION "."
        )
+       set_target_properties(
+               blender
+               PROPERTIES
+                       VS_USER_PROPS "blender.Cpp.user.props"
+       )
 endif()