Merge branch 'master' into xr-devxr-dev

1 files changed, 143 insertions, 128 deletions

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7457358698d..0e9c3a853aa 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -3,7 +3,6 @@
 
 blender_include_dirs(
   ../../intern/clog
-  ../../intern/glew-mx
   ../../intern/guardedalloc
   ../blender/blenkernel
   ../blender/blenlib
@@ -22,6 +21,10 @@ set(LIB
   bf_windowmanager
 )
 
+if(HAVE_FEENABLEEXCEPT)
+  add_definitions(-DHAVE_FEENABLEEXCEPT)
+endif()
+
 if(WITH_TBB)
   # Force TBB libraries to be in front of MKL (part of OpenImageDenoise), so
   # that it is initialized before MKL and static library initialization order
@@ -200,8 +203,10 @@ if(WITH_BUILDINFO)
   SET_SOURCE_FILES_PROPERTIES(${buildinfo_h_fake} PROPERTIES SYMBOLIC TRUE)
 
   # a custom target that is always built
-  add_custom_target(buildinfo ALL
-    DEPENDS ${buildinfo_h_fake})
+  add_custom_target(
+    buildinfo ALL
+    DEPENDS ${buildinfo_h_fake}
+  )
 
   # creates buildinfo.h using cmake script
   add_custom_command(
@@ -272,13 +277,13 @@ if(WITH_PYTHON_MODULE)
 else()
   add_executable(blender ${EXETYPE} ${SRC})
   if(WIN32)
-      add_executable(blender-launcher WIN32
-        blender_launcher_win32.c
-        ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc
-        ${CMAKE_BINARY_DIR}/blender.exe.manifest
-      )
-      target_compile_definitions (blender-launcher PRIVATE -D_UNICODE -DUNICODE)
-      target_link_libraries(blender-launcher Pathcch.lib)
+    add_executable(blender-launcher WIN32
+      blender_launcher_win32.c
+      ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc
+      ${CMAKE_BINARY_DIR}/blender.exe.manifest
+    )
+    target_compile_definitions (blender-launcher PRIVATE -D_UNICODE -DUNICODE)
+    target_link_libraries(blender-launcher Pathcch.lib)
   endif()
 endif()
 
@@ -296,47 +301,53 @@ set(BLENDER_TEXT_FILES
 
 
 # -----------------------------------------------------------------------------
-# Platform Specific Var: TARGETDIR_VER
+# Platform specific target destinations for version dir, libs, bpy, text files.
 
 if(UNIX AND NOT APPLE)
   if(WITH_PYTHON_MODULE)
     if(WITH_INSTALL_PORTABLE)
+      set(TARGETDIR_BPY .)
       set(TARGETDIR_VER ${BLENDER_VERSION})
+      set(TARGETDIR_LIB lib)
     else()
+      set(TARGETDIR_BPY ${PYTHON_SITE_PACKAGES})
       set(TARGETDIR_VER ${PYTHON_SITE_PACKAGES}/${BLENDER_VERSION})
+      set(TARGETDIR_LIB ${PYTHON_SITE_PACKAGES}/lib)
     endif()
   else()
     if(WITH_INSTALL_PORTABLE)
       set(TARGETDIR_VER ${BLENDER_VERSION})
+      set(TARGETDIR_TEXT .)
+      set(TARGETDIR_LIB lib)
     else()
       set(TARGETDIR_VER share/blender/${BLENDER_VERSION})
+      set(TARGETDIR_TEXT share/doc/blender)
     endif()
   endif()
 
 elseif(WIN32)
   set(TARGETDIR_VER ${BLENDER_VERSION})
+  set(TARGETDIR_TEXT .)
+  set(TARGETDIR_LIB .)
 
 elseif(APPLE)
   if(WITH_PYTHON_MODULE)
     if(WITH_INSTALL_PORTABLE)
-      set(BPY_INSTALL_DIR)
       set(TARGETDIR_VER $<TARGET_FILE_DIR:blender>/../Resources/${BLENDER_VERSION})
-      # Keep the `BLENDER_VERSION` folder and bpy.so in the build folder.
-      set(INSTALL_BPY_TO_SITE_PACKAGES OFF)
+      set(TARGETDIR_LIB lib)
     else()
-      # Parent directory of bpy.so for installation.
-      set(BPY_INSTALL_DIR ${PYTHON_LIBPATH}/site-packages)
-      # Defined in terms of site-packages since the site-packages
+      # Paths defined in terms of site-packages since the site-packages
       # directory can be a symlink (brew for example).
-      set(TARGETDIR_VER "${BPY_INSTALL_DIR}/../Resources/${BLENDER_VERSION}")
-      set(INSTALL_BPY_TO_SITE_PACKAGES ON)
+      set(TARGETDIR_BPY ${PYTHON_LIBPATH}/site-packages)
+      set(TARGETDIR_VER ${TARGETDIR_BPY}/../Resources/${BLENDER_VERSION})
+      set(TARGETDIR_LIB ${TARGETDIR_BPY}/lib)
     endif()
   else()
     set(TARGETDIR_VER Blender.app/Contents/Resources/${BLENDER_VERSION})
+    set(TARGETDIR_LIB Blender.app/Contents/Resources/lib)
+    set(TARGETDIR_TEXT Blender.app/Contents/Resources/text)
   endif()
-  # License, copyright, readme files.
-  set(BLENDER_TEXT_FILES_DESTINATION "${TARGETDIR_VER}/../text")
-  set(MAC_BLENDER_TARGET_DYLIBS_DIR "${TARGETDIR_VER}/lib")
+
   # Skip relinking on cpack / install
   set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true)
 endif()
@@ -405,8 +416,8 @@ if(WITH_INTERNATIONAL)
   # Create a custom target which will compile all po to mo
   add_custom_target(
     locales
-    DEPENDS ${_all_mo_files})
-
+    DEPENDS ${_all_mo_files}
+  )
   add_dependencies(blender locales)
 
   # Generate INSTALL rules
@@ -464,22 +475,30 @@ if(UNIX AND NOT APPLE)
         blender_man_page ALL
         COMMAND ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1.py
                 --blender ${EXECUTABLE_OUTPUT_PATH}/blender
-                --output ${CMAKE_CURRENT_BINARY_DIR}/blender.1)
+                --output ${CMAKE_CURRENT_BINARY_DIR}/blender.1
+      )
       add_dependencies(blender_man_page blender)
     endif()
   endif()
 
+  if(PLATFORM_BUNDLED_LIBRARIES AND TARGETDIR_LIB)
+    install(
+      FILES ${PLATFORM_BUNDLED_LIBRARIES}
+      DESTINATION ${TARGETDIR_LIB}
+    )
+  endif()
+
   # there are a few differences between portable and system install
   if(WITH_PYTHON_MODULE)
     if(WITH_INSTALL_PORTABLE)
       install(
         TARGETS blender
-        DESTINATION "."
+        DESTINATION ${TARGETDIR_BPY}
       )
     else()
       install(
         TARGETS blender
-        LIBRARY DESTINATION ${PYTHON_SITE_PACKAGES}
+        LIBRARY DESTINATION ${TARGETDIR_BPY}
       )
     endif()
     # none of the other files are needed currently
@@ -511,16 +530,30 @@ if(UNIX AND NOT APPLE)
     endif()
 
     if(EXISTS ${LIBDIR}/mesa)
-      install(DIRECTORY ${LIBDIR}/mesa/lib DESTINATION ".")
+      install(DIRECTORY ${LIBDIR}/mesa/lib/ DESTINATION "lib/mesa/")
 
       install(
         PROGRAMS
         ${CMAKE_SOURCE_DIR}/release/bin/blender-softwaregl
         DESTINATION "."
       )
-    endif()
 
-    set(BLENDER_TEXT_FILES_DESTINATION ".")
+      # Remove from old location, so existing builds don't start with software
+      # OpenGL now that the lib/ folder is used for other libraries.
+      install(
+        CODE
+        "file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so)\n
+         file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1)\n
+         file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1.5.0)\n
+         file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so)\n
+         file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1)\n
+         file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1.3.1)\n
+         file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so)\n
+         file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0)\n
+         file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0.0.0)\n
+        "
+      )
+    endif()
   else()
     # main blender binary
     install(
@@ -554,7 +587,6 @@ if(UNIX AND NOT APPLE)
         DESTINATION bin
       )
     endif()
-    set(BLENDER_TEXT_FILES_DESTINATION share/doc/blender)
   endif()
 
   if(WITH_PYTHON)
@@ -714,20 +746,22 @@ if(UNIX AND NOT APPLE)
     )
   endif()
 elseif(WIN32)
-
-  set(BLENDER_TEXT_FILES_DESTINATION ".")
+  install(
+    FILES ${LIBDIR}/epoxy/bin/epoxy-0.dll
+    DESTINATION ${TARGETDIR_LIB}
+  )
 
   if(WITH_OPENMP AND MSVC_CLANG)
     install(
-          FILES ${CLANG_OPENMP_DLL}
-          DESTINATION "."
+      FILES ${CLANG_OPENMP_DLL}
+      DESTINATION ${TARGETDIR_LIB}
     )
   endif()
 
   if(WITH_FFTW3)
     install(
-          FILES ${LIBDIR}/fftw3/lib/libfftw3-3.dll
-          DESTINATION "."
+      FILES ${LIBDIR}/fftw3/lib/libfftw3-3.dll
+      DESTINATION ${TARGETDIR_LIB}
     )
   endif()
   if(MSVC_ASAN)
@@ -738,14 +772,14 @@ elseif(WIN32)
       message(FATAL_ERROR "Asan is enabled, but the ASAN runtime is not detected, this is an optional component during the MSVC install, please install it")
     endif()
     install(
-          FILES ${ASAN_DLL}
-          DESTINATION "."
-          CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+      FILES ${ASAN_DLL}
+      DESTINATION ${TARGETDIR_LIB}
+      CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
     )
     install(
-          FILES ${ASAN_DEBUG_DLL}
-          DESTINATION "."
-          CONFIGURATIONS Debug
+      FILES ${ASAN_DEBUG_DLL}
+      DESTINATION ${TARGETDIR_LIB}
+      CONFIGURATIONS Debug
     )
     unset(ASAN_DLL)
     unset(ASAN_DEBUG_DLL)
@@ -753,18 +787,18 @@ elseif(WIN32)
 
   if(WITH_GMP)
     install(
-          FILES ${LIBDIR}/gmp/lib/libgmp-10.dll
-          DESTINATION "."
+      FILES ${LIBDIR}/gmp/lib/libgmp-10.dll
+      DESTINATION ${TARGETDIR_LIB}
     )
     install(
-          FILES ${LIBDIR}/gmp/lib/libgmpxx.dll
-          DESTINATION "."
-          CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+      FILES ${LIBDIR}/gmp/lib/libgmpxx.dll
+      DESTINATION ${TARGETDIR_LIB}
+      CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
     )
     install(
-          FILES ${LIBDIR}/gmp/lib/libgmpxx_d.dll
-          DESTINATION "."
-          CONFIGURATIONS Debug
+      FILES ${LIBDIR}/gmp/lib/libgmpxx_d.dll
+      DESTINATION ${TARGETDIR_LIB}
+      CONFIGURATIONS Debug
     )
   endif()
 
@@ -780,16 +814,16 @@ elseif(WIN32)
   endif()
 
   if(WITH_OPENVDB)
-      install(
-        FILES ${LIBDIR}/openvdb/bin/openvdb.dll
-        DESTINATION "."
-        CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-      )
-      install(
-        FILES ${LIBDIR}/openvdb/bin/openvdb_d.dll
-        DESTINATION "."
-        CONFIGURATIONS Debug
-      )
+    install(
+      FILES ${LIBDIR}/openvdb/bin/openvdb.dll
+      DESTINATION ${TARGETDIR_LIB}
+      CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+    )
+    install(
+      FILES ${LIBDIR}/openvdb/bin/openvdb_d.dll
+      DESTINATION ${TARGETDIR_LIB}
+      CONFIGURATIONS Debug
+    )
   endif()
 
   if(WITH_PYTHON)
@@ -799,14 +833,14 @@ elseif(WIN32)
       install(
         FILES ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python${_PYTHON_VERSION_NO_DOTS}.dll
               ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python3.dll
-        DESTINATION "."
+        DESTINATION ${TARGETDIR_LIB}
         CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
       )
 
       install(
         FILES ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python${_PYTHON_VERSION_NO_DOTS}_d.dll
               ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python3_d.dll
-        DESTINATION "."
+        DESTINATION ${TARGETDIR_LIB}
         CONFIGURATIONS Debug
       )
     endif()
@@ -868,13 +902,13 @@ elseif(WIN32)
       if(WINDOWS_PYTHON_DEBUG)
         install(
           FILES ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}.pdb
-          DESTINATION "."
+          DESTINATION ${TARGETDIR_LIB}
           CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
         )
 
         install(
           FILES ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}_d.pdb
-          DESTINATION "."
+          DESTINATION ${TARGETDIR_LIB}
           CONFIGURATIONS Debug
         )
       endif()
@@ -883,18 +917,6 @@ elseif(WIN32)
     unset(_PYTHON_VERSION_NO_DOTS)
   endif()
 
-  # EGL Runtime Components
-  if(WITH_GL_EGL)
-    if(WIN32)
-      install(FILES "${OPENGLES_DLL}"     DESTINATION ".")
-      install(FILES "${OPENGLES_EGL_DLL}" DESTINATION ".")
-
-      if(WITH_GL_ANGLE)
-        install(FILES "${D3DCOMPILER_DLL}" DESTINATION ".")
-      endif()
-    endif()
-  endif()
-
   if(WITH_CODEC_FFMPEG)
     # Filenames change slightly between ffmpeg versions
     # check both 5.0 and fallback to 4.4 to ease the transition
@@ -908,7 +930,7 @@ elseif(WIN32)
           ${LIBDIR}/ffmpeg/lib/avutil-57.dll
           ${LIBDIR}/ffmpeg/lib/swscale-6.dll
           ${LIBDIR}/ffmpeg/lib/swresample-4.dll
-        DESTINATION "."
+        DESTINATION ${TARGETDIR_LIB}
       )
     else()
       install(
@@ -919,7 +941,7 @@ elseif(WIN32)
           ${LIBDIR}/ffmpeg/lib/avutil-56.dll
           ${LIBDIR}/ffmpeg/lib/swscale-5.dll
           ${LIBDIR}/ffmpeg/lib/swresample-3.dll
-        DESTINATION "."
+        DESTINATION ${TARGETDIR_LIB}
       )
     endif()
   endif()
@@ -927,13 +949,13 @@ elseif(WIN32)
     install(
       FILES
         ${LIBDIR}/tbb/bin/tbb.dll
-      DESTINATION "."
+      DESTINATION ${TARGETDIR_LIB}
       CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
     )
     install(
       FILES
         ${LIBDIR}/tbb/bin/tbb_debug.dll
-      DESTINATION "."
+      DESTINATION ${TARGETDIR_LIB}
       CONFIGURATIONS Debug
     )
   endif()
@@ -942,14 +964,14 @@ elseif(WIN32)
       FILES
         ${LIBDIR}/tbb/bin/tbbmalloc.dll
         ${LIBDIR}/tbb/bin/tbbmalloc_proxy.dll
-      DESTINATION "."
+      DESTINATION ${TARGETDIR_LIB}
       CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
     )
     install(
       FILES
         ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll
         ${LIBDIR}/tbb/bin/tbbmalloc_proxy_debug.dll
-      DESTINATION "."
+      DESTINATION ${TARGETDIR_LIB}
       CONFIGURATIONS Debug
     )
     list(APPEND LIB ${TBB_MALLOC_LIBRARIES})
@@ -958,7 +980,7 @@ elseif(WIN32)
   if(WITH_CODEC_SNDFILE)
     install(
       FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll
-      DESTINATION "."
+      DESTINATION ${TARGETDIR_LIB}
     )
   endif()
 
@@ -966,14 +988,14 @@ elseif(WIN32)
     install(
       FILES
         ${LIBDIR}/openal/lib/OpenAL32.dll
-      DESTINATION "."
+      DESTINATION ${TARGETDIR_LIB}
     )
   endif()
 
   if(WITH_SDL)
     install(
       FILES ${LIBDIR}/sdl/lib/SDL2.dll
-      DESTINATION "."
+      DESTINATION ${TARGETDIR_LIB}
     )
   endif()
 
@@ -983,7 +1005,7 @@ elseif(WIN32)
         ${LIBDIR}/audaspace/lib/audaspace.dll
         ${LIBDIR}/audaspace/lib/audaspace-c.dll
         ${LIBDIR}/audaspace/lib/audaspace-py.dll
-      DESTINATION "."
+      DESTINATION ${TARGETDIR_LIB}
     )
   endif()
 
@@ -995,7 +1017,7 @@ elseif(WIN32)
       ${CMAKE_SOURCE_DIR}/release/windows/batch/blender_factory_startup.cmd
       ${CMAKE_SOURCE_DIR}/release/windows/batch/blender_oculus.cmd
       ${CMAKE_SOURCE_DIR}/release/windows/batch/oculus.json
-    DESTINATION "."
+    DESTINATION ${TARGETDIR_LIB}
   )
 
   if(WITH_BLENDER_THUMBNAILER)
@@ -1054,7 +1076,8 @@ elseif(APPLE)
   set_target_properties(blender PROPERTIES
     MACOSX_BUNDLE_INFO_PLIST ${OSX_APP_SOURCEDIR}/Contents/Info.plist
     MACOSX_BUNDLE_SHORT_VERSION_STRING "${BLENDER_VERSION}.${BLENDER_VERSION_PATCH}"
-    MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION}.${BLENDER_VERSION_PATCH} ${BLENDER_DATE}")
+    MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION}.${BLENDER_VERSION_PATCH} ${BLENDER_DATE}"
+  )
 
   # Gather the date in finder-style
   execute_process(COMMAND date "+%m/%d/%Y/%H:%M"
@@ -1092,17 +1115,10 @@ elseif(APPLE)
       )
   endif()
 
-  if(WITH_OPENMP AND OPENMP_CUSTOM)
+  if(PLATFORM_BUNDLED_LIBRARIES AND TARGETDIR_LIB)
     install(
-      FILES "${OpenMP_LIBRARY}"
-      DESTINATION "${MAC_BLENDER_TARGET_DYLIBS_DIR}"
-    )
-  endif()
-
-  if(WITH_COMPILER_ASAN)
-    install(
-      FILES "${COMPILER_ASAN_LIBRARY}"
-      DESTINATION "${MAC_BLENDER_TARGET_DYLIBS_DIR}"
+      FILES ${PLATFORM_BUNDLED_LIBRARIES}
+      DESTINATION ${TARGETDIR_LIB}
     )
   endif()
 
@@ -1114,6 +1130,7 @@ elseif(APPLE)
       ${TARGETDIR_VER}/python/lib
     )
 
+    # Install Python executable.
     install(
       PROGRAMS ${PYTHON_EXECUTABLE}
       DESTINATION ${TARGETDIR_VER}/python/bin
@@ -1129,13 +1146,11 @@ elseif(APPLE)
     unset(_py_inc_suffix)
   endif()
 
-  if(WITH_PYTHON_MODULE)
-    if(INSTALL_BPY_TO_SITE_PACKAGES)
-      install(
-        TARGETS blender
-        LIBRARY DESTINATION ${BPY_INSTALL_DIR}
-      )
-    endif()
+  if(WITH_PYTHON_MODULE AND TARGETDIR_BPY)
+    install(
+      TARGETS blender
+      LIBRARY DESTINATION ${TARGETDIR_BPY}
+    )
   endif()
 
   if(WITH_DRACO)
@@ -1149,11 +1164,12 @@ endif()
 # -----------------------------------------------------------------------------
 # Generic Install, for all targets
 
-if(DEFINED BLENDER_TEXT_FILES_DESTINATION)
+if(DEFINED TARGETDIR_TEXT)
 
-  configure_file(${CMAKE_SOURCE_DIR}/release/text/readme.html
-                 ${CMAKE_BINARY_DIR}/release/text/readme.html
-                 @ONLY
+  configure_file(
+    ${CMAKE_SOURCE_DIR}/release/text/readme.html
+    ${CMAKE_BINARY_DIR}/release/text/readme.html
+    @ONLY
   )
   list(APPEND BLENDER_TEXT_FILES
     ${CMAKE_BINARY_DIR}/release/text/readme.html
@@ -1161,13 +1177,13 @@ if(DEFINED BLENDER_TEXT_FILES_DESTINATION)
 
   install(
     FILES ${BLENDER_TEXT_FILES}
-    DESTINATION "${BLENDER_TEXT_FILES_DESTINATION}"
+    DESTINATION "${TARGETDIR_TEXT}"
   )
 
   install(
     DIRECTORY
     ${CMAKE_SOURCE_DIR}/release/license
-    DESTINATION "${BLENDER_TEXT_FILES_DESTINATION}"
+    DESTINATION "${TARGETDIR_TEXT}"
 )
 endif()
 
@@ -1175,7 +1191,7 @@ endif()
 delayed_do_install(${TARGETDIR_VER})
 
 unset(BLENDER_TEXT_FILES)
-unset(BLENDER_TEXT_FILES_DESTINATION)
+unset(TARGETDIR_TEXT)
 
 
 # -----------------------------------------------------------------------------
@@ -1216,10 +1232,8 @@ unset(LIB)
 setup_platform_linker_flags(blender)
 setup_platform_linker_libs(blender)
 
-if(APPLE)
-  set_target_properties(blender PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/osx_locals.map)
-elseif(UNIX)
-  set_target_properties(blender PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/blender.map)
+if(DEFINED PLATFORM_SYMBOLS_MAP)
+  set_target_properties(blender PROPERTIES LINK_DEPENDS ${PLATFORM_SYMBOLS_MAP})
 endif()
 
 # -----------------------------------------------------------------------------
@@ -1242,17 +1256,18 @@ if(WIN32)
   set_target_properties(blender PROPERTIES VS_GLOBAL_VcpkgEnabled "false")
   set_target_properties(blender PROPERTIES
     PDB_NAME "blender_private"
-    PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
-    if(WITH_WINDOWS_PDB AND WITH_WINDOWS_STRIPPED_PDB)
-      # This is slightly messy, but single target generators like ninja will not have the
-      # CMAKE_CFG_INTDIR variable and multitarget generators like msbuild will not have
-      # CMAKE_BUILD_TYPE. This can be simplified by target_link_options and the $<CONFIG>
-      # generator expression in newer cmake (2.13+) but until that time this fill have suffice.
-      if(CMAKE_BUILD_TYPE)
-        set_property(TARGET blender APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/blender_public.pdb")
-      else()
-        set_property(TARGET blender APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/blender_public.pdb")
-      endif()
+    PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>"
+  )
+  if(WITH_WINDOWS_PDB AND WITH_WINDOWS_STRIPPED_PDB)
+    # This is slightly messy, but single target generators like ninja will not have the
+    # `CMAKE_CFG_INTDIR` variable and multi-target generators like `msbuild` will not have
+    # `CMAKE_BUILD_TYPE`. This can be simplified by target_link_options and the `$<CONFIG>`
+    # generator expression in newer CMAKE (2.13+) but until that time this fill have suffice.
+    if(CMAKE_BUILD_TYPE)
+      set_property(TARGET blender APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/blender_public.pdb")
+    else()
+      set_property(TARGET blender APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/blender_public.pdb")
+    endif()
   endif()
 endif()