diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-21 15:19:05 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-21 15:19:05 +0300 |
| commit | 81011679ddb1fc57e37fe1ba2eb494a1dedaa0fd (patch) | |
| tree | 54dc7feaf7fbcfbb45891a61bef5113af508696a /build_files/cmake/macros.cmake | |
| parent | bfa888cef28955501195dfbee002bc793685e527 (diff) | |
| parent | 9c02990ac13a25968d8ec15da15129617d3f25d0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 7f46c40e27a..433580fd835 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_GFLAGS) + target_link_libraries(${target} ${GFLAGS_LIBRARIES}) + endif() # We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them.. if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV) @@ -661,12 +664,15 @@ function(SETUP_BLENDER_SORTED_LIBS) extern_wcwidth bf_intern_libmv extern_glog - extern_gflags extern_sdlew bf_intern_glew_mx ) + if(NOT WITH_SYSTEM_GFLAGS) + list(APPEND BLENDER_SORTED_LIBS extern_gflags) + endif() + if(WITH_COMPOSITOR) # added for opencl compositor list_insert_before(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_compositor") |