diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 14:47:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 17:39:13 +0300 |
| commit | 0b856dd97e43cf116ac136b74bc3a559c679522e (patch) | |
| tree | 010fa23fccce75c385bb83255c5de2d6ccc89fac /CMakeLists.txt | |
| parent | 69f40808390a4a761e414daebbfbeeacae342871 (diff) | |
Move GLog/GFlags to extern/
This is where the libraries belongs to actually, they are not only used by
Libmv now, but also by tests and Cycles.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 79844bb0e50..b04a771f17c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2586,6 +2586,21 @@ if(WITH_PYTHON_MODULE) endif() #----------------------------------------------------------------------------- +# Configure GLog/GFlags + +if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) + set(GLOG_DEFINES + -DGOOGLE_GLOG_DLL_DECL= + ) + + set(GFLAGS_DEFINES + -DGFLAGS_DLL_DEFINE_FLAG= + -DGFLAGS_DLL_DECLARE_FLAG= + -DGFLAGS_DLL_DECL= + ) +endif() + +#----------------------------------------------------------------------------- # Extra compile flags if(CMAKE_COMPILER_IS_GNUCC) |