From e4ab70da862b5852a6e3f7bab489bed8c3b18193 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 21 Apr 2017 14:26:25 +0200 Subject: CMake: Add option to build against system-wide Glog Similar to previous commit for Gflags. --- build_files/cmake/macros.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'build_files/cmake/macros.cmake') diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 0221ac55e42..f62e55941a7 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -491,6 +491,9 @@ function(setup_liblinks target_link_libraries(${target} ${NDOF_LIBRARIES}) endif() endif() + if(WITH_SYSTEM_GLOG) + target_link_libraries(${target} ${GLOG_LIBRARIES}) + endif() if(WITH_SYSTEM_GFLAGS) target_link_libraries(${target} ${GFLAGS_LIBRARIES}) endif() @@ -661,12 +664,15 @@ function(SETUP_BLENDER_SORTED_LIBS) extern_rangetree extern_wcwidth bf_intern_libmv - extern_glog extern_sdlew bf_intern_glew_mx ) + if(NOT WITH_SYSTEM_GLOG) + list(APPEND BLENDER_SORTED_LIBS extern_glog) + endif() + if(NOT WITH_SYSTEM_GFLAGS) list(APPEND BLENDER_SORTED_LIBS extern_gflags) endif() -- cgit v1.2.3