[Bf-blender-cvs] [63a4e0cefb6] temp-sybren-usd-patch-02: USD: set Linux-specific #define only on Linux

Sybren A. Stüvel noreply at git.blender.org
Wed Dec 11 17:22:17 CET 2019


Commit: 63a4e0cefb6571e9fcfc01348190d2881c789b88
Author: Sybren A. Stüvel
Date:   Wed Dec 11 17:14:14 2019 +0100
Branches: temp-sybren-usd-patch-02
https://developer.blender.org/rB63a4e0cefb6571e9fcfc01348190d2881c789b88

USD: set Linux-specific #define only on Linux

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

M	tests/gtests/usd/CMakeLists.txt

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

diff --git a/tests/gtests/usd/CMakeLists.txt b/tests/gtests/usd/CMakeLists.txt
index a8831b66100..020122bad1f 100644
--- a/tests/gtests/usd/CMakeLists.txt
+++ b/tests/gtests/usd/CMakeLists.txt
@@ -22,7 +22,9 @@
 # may be removed without further notice at a future date", which is caused by the USD library
 # including <ext/hash_set>. Nothing we can do about that until they change what
 # they include, so this just suppresses it.
-add_definitions(-D_GLIBCXX_PERMIT_BACKWARD_HASH)
+if(UNIX AND NOT APPLE)
+  add_definitions(-D_GLIBCXX_PERMIT_BACKWARD_HASH)
+endif()
 
 set(INC
   .



More information about the Bf-blender-cvs mailing list