Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fully support WITH_CYCLES_LOGGING option

Browse Source 
This commit generalizes logging module a little bit in making it possible to use
Glog logging in standalone Cycles repository.
This commit is contained in:
Sergey Sharybin
2014-11-16 01:12:19 +05:00
parent f2665d52e2
commit bbf12722ed
7 changed files with 94 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
intern/cycles/cmake/external_libs.cmake
View File

@@ -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()