[Bf-blender-cvs] [c8ce6532297] tmp_libupdate_34: Fix install error on non-Windows

Brecht Van Lommel noreply at git.blender.org
Tue Aug 16 21:55:46 CEST 2022


Commit: c8ce65322978e4af19eba77e2378c2757c8072c6
Author: Brecht Van Lommel
Date:   Tue Aug 16 21:42:26 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rBc8ce65322978e4af19eba77e2378c2757c8072c6

Fix install error on non-Windows

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

M	source/creator/CMakeLists.txt

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

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 54fc2d3b69e..5897da0da7c 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1303,19 +1303,22 @@ if(WITH_USD)
     ${USD_LIBRARY_DIR}/usd
     DESTINATION "${TARGETDIR_VER}/datafiles"
   )
-  install(FILES
-    ${LIBDIR}/usd/lib/usd_usd_ms.dll
-    DESTINATION "."
-    CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-  )
-  install(FILES
-    ${LIBDIR}/usd/lib/usd_usd_ms_d.dll
-    DESTINATION "."
-    CONFIGURATIONS Debug
-  )
+
+  if(WIN32)
+    install(FILES
+      ${LIBDIR}/usd/lib/usd_usd_ms.dll
+      DESTINATION "."
+      CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+    )
+    install(FILES
+      ${LIBDIR}/usd/lib/usd_usd_ms_d.dll
+      DESTINATION "."
+      CONFIGURATIONS Debug
+    )
+  endif()
 endif()
 
-if(WITH_BOOST)
+if(WIN32 AND WITH_BOOST)
   install(DIRECTORY
     ${LIBDIR}/boost/lib/
     DESTINATION "."



More information about the Bf-blender-cvs mailing list