forked from bartvdbraak/blender
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
This commit is contained in:
parent
3bda3a2992
commit
8e7faf0e67
3
extern/gflags/README.blender
vendored
3
extern/gflags/README.blender
vendored
@ -14,6 +14,9 @@ Local modifications:
|
|||||||
* Disabeld HAVE_FNMATCH_H
|
* Disabeld HAVE_FNMATCH_H
|
||||||
* Forced disabled GFLAGS_IS_A_DLL
|
* 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
|
- Applied some modifications from fork https://github.com/Nazg-Gul/gflags.git
|
||||||
(see https://github.com/gflags/gflags/pull/129)
|
(see https://github.com/gflags/gflags/pull/129)
|
||||||
|
|
||||||
|
2
extern/gflags/src/gflags/gflags_declare.h
vendored
2
extern/gflags/src/gflags/gflags_declare.h
vendored
@ -51,7 +51,7 @@
|
|||||||
// Must be overwritten when this header file is used with the optionally also
|
// Must be overwritten when this header file is used with the optionally also
|
||||||
// built static library instead; set by CMake's INTERFACE_COMPILE_DEFINITIONS.
|
// built static library instead; set by CMake's INTERFACE_COMPILE_DEFINITIONS.
|
||||||
#ifndef GFLAGS_IS_A_DLL
|
#ifndef GFLAGS_IS_A_DLL
|
||||||
# define GFLAGS_IS_A_DLL 1
|
# define GFLAGS_IS_A_DLL 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// We always want to import the symbols of the gflags library.
|
// We always want to import the symbols of the gflags library.
|
||||||
|
Loading…
Reference in New Issue
Block a user