[Bf-blender-cvs] [0cd8aaef604] tmp_libupdate_34: Merge branch 'master' into tmp_libupdate_34

[Brecht Van Lommel]

Commit: 0cd8aaef604c656337ebca8088c2dcec8a130c08
Author: Brecht Van Lommel
Date:   Tue Aug 23 16:05:30 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rB0cd8aaef604c656337ebca8088c2dcec8a130c08

Merge branch 'master' into tmp_libupdate_34

===================================================================



===================================================================

diff --cc source/creator/CMakeLists.txt
index a4068e63182,0e9c3a853aa..2698f298404
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@@ -323,6 -327,8 +328,7 @@@ if(UNIX AND NOT APPLE
  
  elseif(WIN32)
    set(TARGETDIR_VER ${BLENDER_VERSION})
+   set(TARGETDIR_TEXT .)
 -  set(TARGETDIR_LIB .)
  
  elseif(APPLE)
    if(WITH_PYTHON_MODULE)
@@@ -341,9 -344,10 +344,9 @@@
      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")
 -
    # Skip relinking on cpack / install
    set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true)
  endif()
@@@ -520,17 -498,9 +530,10 @@@ if(UNIX AND NOT APPLE
      else()
        install(
          TARGETS blender
-         LIBRARY DESTINATION ${BPY_INSTALL_DIR}
-       )
-     endif()
- 
-     if(PLATFORM_BUNDLED_LIBRARIES)
-       install(
-         FILES ${PLATFORM_BUNDLED_LIBRARIES}
-         DESTINATION ${BPY_INSTALL_DIR}/lib
+         LIBRARY DESTINATION ${TARGETDIR_BPY}
        )
      endif()
 +
      # none of the other files are needed currently
    elseif(WITH_INSTALL_PORTABLE)
      install(
@@@ -610,24 -587,11 +620,23 @@@
          DESTINATION bin
        )
      endif()
-     set(BLENDER_TEXT_FILES_DESTINATION share/doc/blender)
    endif()
  
 -  if(WITH_PYTHON)
 -    if(WITH_PYTHON_INSTALL)
 +  if(WITH_PYTHON AND WITH_PYTHON_INSTALL)
 +    # Install executable
 +    install(
 +      PROGRAMS ${PYTHON_EXECUTABLE}
 +      DESTINATION ${TARGETDIR_VER}/python/bin
 +    )
  
 +    if(EXISTS ${LIBDIR})
 +      # Precompiled libraries, copy over complete lib directory.
 +      install_dir(
 +        ${PYTHON_LIBPATH}
 +        ${TARGETDIR_VER}/python
 +      )
 +    else()
 +      # System libraries.
        install(
          PROGRAMS ${PYTHON_EXECUTABLE}
          DESTINATION ${TARGETDIR_VER}/python/bin
@@@ -799,12 -746,9 +808,9 @@@
      )
    endif()
  elseif(WIN32)
- 
-   set(BLENDER_TEXT_FILES_DESTINATION ".")
- 
 -  install(
 +  windows_install_shared_manifest(
      FILES ${LIBDIR}/epoxy/bin/epoxy-0.dll
 -    DESTINATION ${TARGETDIR_LIB}
 +    ALL
    )
  
    if(WITH_OPENMP AND MSVC_CLANG)
@@@ -1304,56 -1242,12 +1308,61 @@@ endif(
  # files are required at runtime.
  if(WITH_USD)
    add_definitions(-DWITH_USD)
 -  install(DIRECTORY
 -    ${USD_LIBRARY_DIR}/usd
 -    DESTINATION "${TARGETDIR_VER}/datafiles"
 -  )
 +  blender_include_dirs(../blender/io/usd)
 +  # On windows the usd library site in ./blender.shared copy the files
 +  # relative to the location of the USD dll, if the dll does not exist
 +  # assume we are linking against the static 3.4 lib.
 +  if(WIN32 AND EXISTS ${LIBDIR}/usd/lib/usd_usd_ms.dll)
 +    install(DIRECTORY
 +      ${USD_LIBRARY_DIR}/usd
 +      DESTINATION "./blender.shared"
 +    )
++  elseif(USD_PYTHON_SUPPORT)
++    install(DIRECTORY
++      ${USD_LIBRARY_DIR}/usd
++      DESTINATION ${TARGETDIR_LIB}
++    )
 +  else()
 +    install(DIRECTORY
 +      ${USD_LIBRARY_DIR}/usd
 +      DESTINATION "${TARGETDIR_VER}/datafiles"
 +    )
 +  endif()
 +  if(WIN32)
 +    # If this file exists we are building against a 3.4 library folder
 +    # that needs these dll's installed.
 +    if(EXISTS ${LIBDIR}/usd/lib/usd_usd_ms.dll)
 +      windows_install_shared_manifest(FILES
 +        ${LIBDIR}/usd/lib/usd_usd_ms.dll
 +        RELEASE
 +      )
 +      windows_install_shared_manifest(FILES
 +        ${LIBDIR}/usd/lib/usd_usd_ms_d.dll
 +        DEBUG
 +      )
 +    endif()
 +  endif()
  endif()
  
 +if(WIN32 AND WITH_BOOST)
 +  set(BOOST_COMPONENTS atomic chrono date_time filesystem
 +    iostreams locale program_options regex
 +    serialization system thread wave wserialization
 +    python${_PYTHON_VERSION_NO_DOTS} numpy${_PYTHON_VERSION_NO_DOTS}
 +  )
 +  foreach(component ${BOOST_COMPONENTS})
 +    if(EXISTS ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_${component}-${BOOST_POSTFIX}.dll)
 +      windows_install_shared_manifest(
 +        FILES ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_${component}-${BOOST_POSTFIX}.dll
 +        RELEASE
 +      )
 +      windows_install_shared_manifest(
 +        FILES ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_${component}-${BOOST_DEBUG_POSTFIX}.dll
 +        DEBUG
 +      )
 +    endif()
 +  endforeach()
 +endif()
  
  # vcpkg substitutes our libs with theirs, which will cause issues when you
  # you run these builds on other systems due to missing dlls. So we opt out