diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-01-20 16:03:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-20 16:16:05 +0300 |
| commit | 8e7faf0e673e122e1998028a05be27274419081b (patch) | |
| tree | f97756f2b009cfccddc7d4c2b65d2b1bec4b71be /extern | |
| parent | 3bda3a2992f46126ede1bbc6c3babdad4c154970 (diff) | |
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
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/gflags/README.blender | 3 | ||||
| -rw-r--r-- | extern/gflags/src/gflags/gflags_declare.h | 2 |
2 files changed, 4 insertions, 1 deletions
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. |