[Bf-blender-cvs] [2a4c40f4b92] master: Glog: Attempt to fix compilation error on Windows
Sergey Sharybin
noreply at git.blender.org
Thu Mar 22 17:02:47 CET 2018
Commit: 2a4c40f4b9240246e013c9c9587925c7eb5ea70d
Author: Sergey Sharybin
Date: Thu Mar 22 17:01:42 2018 +0100
Branches: master
https://developer.blender.org/rB2a4c40f4b9240246e013c9c9587925c7eb5ea70d
Glog: Attempt to fix compilation error on Windows
Ideally it should be possible without hacking into sources files
of Glog itself.
===================================================================
M extern/glog/CMakeLists.txt
===================================================================
diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index 32f4dca77e8..59833151e4e 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -23,7 +23,6 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- src
../gflags/src
)
@@ -71,8 +70,13 @@ if(WIN32)
list(APPEND INC
src/windows
+ src
)
else()
+ list(APPEND INC
+ src
+ )
+
list(APPEND SRC
src/demangle.cc
src/signalhandler.cc
More information about the Bf-blender-cvs
mailing list