diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index dc07be70f84..178a63fba7c 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1371,13 +1371,13 @@ macro(windows_generate_shared_manifest) NAME "blender.shared" ) install( - FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest - DESTINATION "./blender.shared" - CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel + FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest + DESTINATION "./blender.shared" + CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel ) install( - FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest - DESTINATION "./blender.shared" - CONFIGURATIONS Debug + FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest + DESTINATION "./blender.shared" + CONFIGURATIONS Debug ) endmacro() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 2b68fa60f15..cf9226433a3 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -351,9 +351,9 @@ endif() if(WITH_USD) find_package_wrapper(USD) set_and_warn_library_found("USD" USD_FOUND WITH_USD) - if(WITH_USD) + if(WITH_USD) add_bundled_libraries(usd/lib) - endif() + endif() endif() if(WITH_MATERIALX) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 3ecea7c5929..47efd9a67b6 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -953,30 +953,30 @@ elseif(WIN32) endif() if(WITH_OPENVDB) - windows_install_shared_manifest( - FILES ${LIBDIR}/openvdb/bin/openvdb.dll - RELEASE - ) - windows_install_shared_manifest( - FILES ${LIBDIR}/openvdb/bin/openvdb_d.dll - DEBUG - ) + windows_install_shared_manifest( + FILES ${LIBDIR}/openvdb/bin/openvdb.dll + RELEASE + ) + windows_install_shared_manifest( + FILES ${LIBDIR}/openvdb/bin/openvdb_d.dll + DEBUG + ) - # This will not exist for 3.4 and earlier lib folders - # to ease the transition, support both 3.4 and 3.5 lib - # folders. - if(EXISTS ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd) - install( - FILES ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd - DESTINATION ${TARGETDIR_VER}/python/lib/site-packages - CONFIGURATIONS Debug - ) - install( - FILES ${LIBDIR}/openvdb/python/pyopenvdb.pyd - DESTINATION ${TARGETDIR_VER}/python/lib/site-packages - CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel - ) - endif() + # This will not exist for 3.4 and earlier lib folders + # to ease the transition, support both 3.4 and 3.5 lib + # folders. + if(EXISTS ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd) + install( + FILES ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd + DESTINATION ${TARGETDIR_VER}/python/lib/site-packages + CONFIGURATIONS Debug + ) + install( + FILES ${LIBDIR}/openvdb/python/pyopenvdb.pyd + DESTINATION ${TARGETDIR_VER}/python/lib/site-packages + CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel + ) + endif() endif() if(WITH_MATERIALX) @@ -1137,22 +1137,22 @@ elseif(WIN32) # MaterialX python bindings install( - DIRECTORY ${LIBDIR}/materialx/python/Release/MaterialX - DESTINATION ${TARGETDIR_VER}/python/lib/site-packages/ - CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel - PATTERN ".svn" EXCLUDE - PATTERN "__pycache__" EXCLUDE # * any cache * - PATTERN "*.pyc" EXCLUDE # * any cache * - PATTERN "*.pyo" EXCLUDE # * any cache * + DIRECTORY ${LIBDIR}/materialx/python/Release/MaterialX + DESTINATION ${TARGETDIR_VER}/python/lib/site-packages/ + CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel + PATTERN ".svn" EXCLUDE + PATTERN "__pycache__" EXCLUDE # * any cache * + PATTERN "*.pyc" EXCLUDE # * any cache * + PATTERN "*.pyo" EXCLUDE # * any cache * ) install( - DIRECTORY ${LIBDIR}/materialx/python/Debug/MaterialX - DESTINATION ${TARGETDIR_VER}/python/lib/site-packages/ - CONFIGURATIONS Debug - PATTERN ".svn" EXCLUDE - PATTERN "__pycache__" EXCLUDE # * any cache * - PATTERN "*.pyc" EXCLUDE # * any cache * - PATTERN "*.pyo" EXCLUDE # * any cache * + DIRECTORY ${LIBDIR}/materialx/python/Debug/MaterialX + DESTINATION ${TARGETDIR_VER}/python/lib/site-packages/ + CONFIGURATIONS Debug + PATTERN ".svn" EXCLUDE + PATTERN "__pycache__" EXCLUDE # * any cache * + PATTERN "*.pyc" EXCLUDE # * any cache * + PATTERN "*.pyo" EXCLUDE # * any cache * ) endif()