diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-12 14:01:30 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:08 +0300 |
commit | 93ca68b50c9112748366de4573f6554b7368d7cc (patch) | |
tree | a36a68066cfe5c8b94ea71be2d475bb4bd1d5337 /intern/cycles/CMakeLists.txt | |
parent | 405c0fddb47b766a1a16af3cd3dab9387f17d43d (diff) |
Cycles: Be ready for gflags namespace auto-detect
This way it is now possible to use gflags >= 2.1, where all the
functions were moved from google to gflags namespace.
This isn't currently used in blender, but for standalone repository
this change is essential.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index fc80a6ef126..a7767488a73 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -154,6 +154,7 @@ add_definitions( if(WITH_CYCLES_LOGGING) add_definitions(-DWITH_CYCLES_LOGGING) add_definitions(-DGOOGLE_GLOG_DLL_DECL=) + add_definitions(-DCYCLES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) include_directories( SYSTEM ${GLOG_INCLUDE_DIRS} |