[Bf-blender-cvs] [8e7faf0e673] blender-v2.82-release: Fix failing cycles_render_graph_finalize_test when building with clang

Ray Molenkamp noreply at git.blender.org
Mon Jan 20 14:16:11 CET 2020


Commit: 8e7faf0e673e122e1998028a05be27274419081b
Author: Ray Molenkamp
Date:   Mon Jan 20 14:03:50 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB8e7faf0e673e122e1998028a05be27274419081b

Fix failing cycles_render_graph_finalize_test when building with clang

The gflags library was not fully configured to be built as a static
library, only one of two files was changed.

Differential Revision: https://developer.blender.org/D6611

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

M	extern/gflags/README.blender
M	extern/gflags/src/gflags/gflags_declare.h

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

diff --git a/extern/gflags/README.blender b/extern/gflags/README.blender
index c57f5ce53ca..be68c310997 100644
--- a/extern/gflags/README.blender
+++ b/extern/gflags/README.blender
@@ -14,6 +14,9 @@ Local modifications:
   * Disabeld HAVE_FNMATCH_H
   * Forced disabled GFLAGS_IS_A_DLL
 
+- gflags_declare.h was modified
+  * Forced disabled GFLAGS_IS_A_DLL
+
 - Applied some modifications from fork https://github.com/Nazg-Gul/gflags.git
   (see https://github.com/gflags/gflags/pull/129)
 
diff --git a/extern/gflags/src/gflags/gflags_declare.h b/extern/gflags/src/gflags/gflags_declare.h
index 98747f3cda1..3b187bd4153 100644
--- a/extern/gflags/src/gflags/gflags_declare.h
+++ b/extern/gflags/src/gflags/gflags_declare.h
@@ -51,7 +51,7 @@
 // Must be overwritten when this header file is used with the optionally also
 // built static library instead; set by CMake's INTERFACE_COMPILE_DEFINITIONS.
 #ifndef GFLAGS_IS_A_DLL
-#  define GFLAGS_IS_A_DLL 1
+#  define GFLAGS_IS_A_DLL 0
 #endif
 
 // We always want to import the symbols of the gflags library.



More information about the Bf-blender-cvs mailing list