sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix failing cycles_render_graph_finalize_test when building with clang

Browse Source 
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
This commit is contained in:
Ray Molenkamp 2020-01-20 14:03:50 +01:00 committed by Brecht Van Lommel
parent 3bda3a2992
commit 8e7faf0e67
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extern/gflags/README.blender vendored
View File

@ -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)

2
extern/gflags/src/gflags/gflags_declare.h vendored
View File

@ -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.