diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-15 23:12:19 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:07 +0300 |
| commit | bbf12722edb7d1cfbbdedd6757275ff386211fe0 (patch) | |
| tree | caf5c11413443ca2e0e3060fa65e413271ce2be1 /intern/cycles/CMakeLists.txt | |
| parent | f2665d52e220a7726f1ca84127a1d1fb8078f521 (diff) | |
Cycles: Fully support WITH_CYCLES_LOGGING option
This commit generalizes logging module a little bit in making it possible to use
Glog logging in standalone Cycles repository.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 56deb8d0ea0..06a6120f41a 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -134,19 +134,11 @@ add_definitions( if(WITH_CYCLES_LOGGING) add_definitions(-DWITH_CYCLES_LOGGING) add_definitions(-DGOOGLE_GLOG_DLL_DECL=) - if(WIN32) - include_directories( - SYSTEM - ../../extern/libmv/third_party/glog/src/windows - ../../extern/libmv/third_party/gflags - ) - else() - include_directories( - SYSTEM - ../../extern/libmv/third_party/glog/src - ../../extern/libmv/third_party/gflags - ) - endif() + include_directories( + SYSTEM + ${GLOG_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} + ) endif() # Debugging capabilities (debug passes etc). |