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/app/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/app/CMakeLists.txt')
-rw-r--r-- | intern/cycles/app/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 63cd0bca4b4..d48ef51ded4 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -37,7 +37,14 @@ if(NOT PUGIXML_LIBRARIES STREQUAL "") list(APPEND LIBRARIES ${PUGIXML_LIBRARIES}) endif() -if(NOT CYCLES_STANDALONE_REPOSITORY) +if(CYCLES_STANDALONE_REPOSITORY) + if(WITH_CYCLES_LOGGING) + list(APPEND LIBRARIES + ${GLOG_LIBRARIES} + ${GFLAGS_LIBRARIES} + ) + endif() +else() list(APPEND LIBRARIES bf_intern_glew_mx) endif() |