[Bf-blender-cvs] [d55a9cac2c0] master: CMake: correct bad change to ceres linking

Campbell Barton noreply at git.blender.org
Thu Apr 18 12:44:45 CEST 2019


Commit: d55a9cac2c0aa6a7d130a256cac7c04e52cdee4a
Author: Campbell Barton
Date:   Thu Apr 18 12:30:44 2019 +0200
Branches: master
https://developer.blender.org/rBd55a9cac2c0aa6a7d130a256cac7c04e52cdee4a

CMake: correct bad change to ceres linking

Revert part of 45055199a2e51

===================================================================

M	extern/ceres/CMakeLists.txt

===================================================================

diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt
index bd3d7f7dab4..4ab3bffb705 100644
--- a/extern/ceres/CMakeLists.txt
+++ b/extern/ceres/CMakeLists.txt
@@ -257,14 +257,9 @@ set(SRC
 )
 
 set(LIB
+  extern_glog
 )
 
-if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
-  list(APPEND LIB
-    extern_glog
-  )
-endif()
-
 if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
   list(APPEND SRC
     internal/ceres/generated/partitioned_matrix_view_2_2_2.cc



More information about the Bf-blender-cvs mailing list