From bbf12722edb7d1cfbbdedd6757275ff386211fe0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 16 Nov 2014 01:12:19 +0500 Subject: 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. --- intern/cycles/cmake/external_libs.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'intern/cycles/cmake') 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() -- cgit v1.2.3