bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
eee5a880f1
blender/extern/glog/CMakeLists.txt

94 lines
2.0 KiB
CMake
Raw Normal View History

Re-organize structure of GLog/GFlags CMake libraries The idea is to split them into two separate targets and have dedicated include directories list for each of them in order to avoid some annoying include header modifications in comparison with upstream. Reviewers: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1706
2016-01-03 10:07:30 +00:00
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2016, Blender Foundation
# All rights reserved.
# ***** END GPL LICENSE BLOCK *****
set(INC
Glog/gflags: Reduce amount of local modifications With better directory layout and more proper include statements we can avoid several local modifications, such as changing config.h for Windows Glog and the ones related on pass-through statements in logging headers in Glog. This commit also makes unused functions not-a-warning for external code.
2018-03-23 13:32:18 +00:00
src
Move GLog/GFlags to extern/ This is where the libraries belongs to actually, they are not only used by Libmv now, but also by tests and Cycles.
2016-01-04 11:47:36 +00:00
../gflags/src
Re-organize structure of GLog/GFlags CMake libraries The idea is to split them into two separate targets and have dedicated include directories list for each of them in order to avoid some annoying include header modifications in comparison with upstream. Reviewers: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1706
2016-01-03 10:07:30 +00:00
)
set(INC_SYS
)
set(SRC
src/logging.cc
src/raw_logging.cc
src/utilities.cc
src/vlog_is_on.cc
src/utilities.h
src/config.h
src/config_freebsd.h
CMake: include missing headers
2018-02-09 02:48:34 +00:00
src/config_haiku.h
Re-organize structure of GLog/GFlags CMake libraries The idea is to split them into two separate targets and have dedicated include directories list for each of them in order to avoid some annoying include header modifications in comparison with upstream. Reviewers: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1706
2016-01-03 10:07:30 +00:00
src/config_hurd.h
src/config_linux.h
src/config_mac.h
src/base/commandlineflags.h
src/base/googleinit.h
src/base/mutex.h
src/stacktrace.h
src/stacktrace_generic-inl.h
src/stacktrace_libunwind-inl.h
src/stacktrace_powerpc-inl.h
src/stacktrace_x86_64-inl.h
src/stacktrace_x86-inl.h
)
if(WIN32)
list(APPEND SRC
src/windows/port.cc
src/windows/glog/raw_logging.h
src/windows/glog/vlog_is_on.h
src/windows/glog/logging.h
src/windows/glog/log_severity.h
src/windows/port.h
src/windows/config.h
)
list(APPEND INC
src/windows
)
else()
Glog: Attempt to fix compilation error on Windows Ideally it should be possible without hacking into sources files of Glog itself.
2018-03-22 16:01:42 +00:00
list(APPEND INC
Glog/gflags: Reduce amount of local modifications With better directory layout and more proper include statements we can avoid several local modifications, such as changing config.h for Windows Glog and the ones related on pass-through statements in logging headers in Glog. This commit also makes unused functions not-a-warning for external code.
2018-03-23 13:32:18 +00:00
include
Glog: Attempt to fix compilation error on Windows Ideally it should be possible without hacking into sources files of Glog itself.
2018-03-22 16:01:42 +00:00
)
Re-organize structure of GLog/GFlags CMake libraries The idea is to split them into two separate targets and have dedicated include directories list for each of them in order to avoid some annoying include header modifications in comparison with upstream. Reviewers: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1706
2016-01-03 10:07:30 +00:00
list(APPEND SRC
src/demangle.cc
src/signalhandler.cc
src/symbolize.cc
src/demangle.h
src/symbolize.h
Glog/gflags: Reduce amount of local modifications With better directory layout and more proper include statements we can avoid several local modifications, such as changing config.h for Windows Glog and the ones related on pass-through statements in logging headers in Glog. This commit also makes unused functions not-a-warning for external code.
2018-03-23 13:32:18 +00:00
include/glog/logging.h
include/glog/log_severity.h
include/glog/raw_logging.h
include/glog/vlog_is_on.h
Re-organize structure of GLog/GFlags CMake libraries The idea is to split them into two separate targets and have dedicated include directories list for each of them in order to avoid some annoying include header modifications in comparison with upstream. Reviewers: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1706
2016-01-03 10:07:30 +00:00
)
endif()
Move GLog/GFlags to extern/ This is where the libraries belongs to actually, they are not only used by Libmv now, but also by tests and Cycles.
2016-01-04 11:47:36 +00:00
add_definitions(${GFLAGS_DEFINES})
add_definitions(${GLOG_DEFINES})
Re-organize structure of GLog/GFlags CMake libraries The idea is to split them into two separate targets and have dedicated include directories list for each of them in order to avoid some annoying include header modifications in comparison with upstream. Reviewers: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1706
2016-01-03 10:07:30 +00:00
blender_add_lib(extern_glog "${SRC}" "${INC}" "${INC_SYS}")
Reference in New Issue Copy Permalink