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/cmake | |
| 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/cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 537de2e7bc9..465f2d27cf9 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -109,5 +109,20 @@ if(CYCLES_STANDALONE_REPOSITORY) find_package(LLVM REQUIRED) endif() + #### + # Logging + if(WITH_CYCLES_LOGGING) + find_package(Glog REQUIRED) + find_package(Gflags REQUIRED) + endif() + unset(_lib_DIR) +else() + if(WIN32) + set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/libmv/third_party/glog/src/windows) + set(GFLAGS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/libmv/third_party/gflags) + else() + set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/libmv/third_party/glog/src) + set(GFLAGS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/libmv/third_party/gflags) + endif() endif() |