diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 15:26:25 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 15:36:34 +0300 |
| commit | e4ab70da862b5852a6e3f7bab489bed8c3b18193 (patch) | |
| tree | 065e30e1411348dc868fef3621c235e95a651d8d /intern | |
| parent | 9c02990ac13a25968d8ec15da15129617d3f25d0 (diff) | |
CMake: Add option to build against system-wide Glog
Similar to previous commit for Gflags.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 5 |
3 files changed, 9 insertions, 17 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 806a8660e8c..c53a9f91cc0 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -191,7 +191,7 @@ endif() # Logging capabilities using GLog library. if(WITH_CYCLES_LOGGING) add_definitions(-DWITH_CYCLES_LOGGING) - add_definitions(-DGOOGLE_GLOG_DLL_DECL=) + add_definitions(${GLOG_DEFINES}) add_definitions(-DCYCLES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) include_directories( SYSTEM diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 231ef58f7ae..08a3931ef46 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -35,18 +35,15 @@ if(WITH_CYCLES_OSL) list(APPEND LIBRARIES cycles_kernel_osl) endif() -if(CYCLES_STANDALONE_REPOSITORY) - if(WITH_CYCLES_LOGGING) - list(APPEND LIBRARIES - ${GLOG_LIBRARIES} - ${GFLAGS_LIBRARIES} - ) - endif() -else() +if(NOT CYCLES_STANDALONE_REPOSITORY) list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc) - if(WITH_CYCLES_LOGGING) - list(APPEND LIBRARIES extern_glog ${GFLAGS_LIBRARIES}) - endif() +endif() + +if(WITH_CYCLES_LOGGING) + list(APPEND LIBRARIES + ${GLOG_LIBRARIES} + ${GFLAGS_LIBRARIES} + ) endif() if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 68e7f0a6eac..df88b91f5ac 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -135,10 +135,5 @@ if(CYCLES_STANDALONE_REPOSITORY) unset(_lib_DIR) else() - if(WIN32) - set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src/windows) - else() - set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src) - endif() set(LLVM_LIBRARIES ${LLVM_LIBRARY}) endif() |