[Bf-blender-cvs] [c1c41d43327] temp-cxx-upgrade: Fix Glog compilation error on Windows

Sergey Sharybin noreply at git.blender.org
Thu Jun 18 13:36:30 CEST 2020


Commit: c1c41d433272a6e8245784b38ffdd48635537360
Author: Sergey Sharybin
Date:   Thu Jun 18 13:36:02 2020 +0200
Branches: temp-cxx-upgrade
https://developer.blender.org/rBc1c41d433272a6e8245784b38ffdd48635537360

Fix Glog compilation error on Windows

Some files are to be included on all platforms now.

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

M	extern/glog/CMakeLists.txt

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

diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index 14b6d6ca109..2a9736425a8 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -27,11 +27,16 @@ set(INC_SYS
 )
 
 set(SRC
+  src/demangle.cc
   src/logging.cc
   src/raw_logging.cc
+  src/signalhandler.cc
+  src/symbolize.cc
   src/utilities.cc
   src/vlog_is_on.cc
 
+  src/demangle.h
+  src/symbolize.h
   src/utilities.h
 
   src/config.h
@@ -88,13 +93,6 @@ else()
     include
   )
   list(APPEND SRC
-    src/demangle.cc
-    src/signalhandler.cc
-    src/symbolize.cc
-
-    src/demangle.h
-    src/symbolize.h
-
     include/glog/logging.h
     include/glog/log_severity.h
     include/glog/raw_logging.h



More information about the Bf-blender-cvs mailing list