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

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

98 lines
1.7 KiB
CMake
Raw Normal View History

License headers: use SPDX-FileCopyrightText for CMake files
2023-06-14 12:49:59 +00:00
# SPDX-FileCopyrightText: 2016 Blender Foundation
#
File headers: SPDX License migration Use a shorter/simpler license convention, stops the header taking so much space. Follow the SPDX license specification: https://spdx.org/licenses - C/C++/objc/objc++ - Python - Shell Scripts - CMake, GNUmakefile While most of the source tree has been included - `./extern/` was left out. - `./intern/cycles` & `./intern/atomic` are also excluded because they use different header conventions. doc/license/SPDX-license-identifiers.txt has been added to list SPDX all used identifiers. See P2788 for the script that automated these edits. Reviewed By: brecht, mont29, sergey Ref D14069
2022-02-10 22:07:11 +00:00
# SPDX-License-Identifier: GPL-2.0-or-later
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
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
Upgrade Google libraries Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0. Hopefully this will solve compilation error on MSVC with C++17.
2020-06-18 11:23:12 +00:00
src/demangle.cc
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/logging.cc
src/raw_logging.cc
Upgrade Google libraries Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0. Hopefully this will solve compilation error on MSVC with C++17.
2020-06-18 11:23:12 +00:00
src/signalhandler.cc
src/symbolize.cc
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/utilities.cc
src/vlog_is_on.cc
Cleanup: use 2 space indentation for CMake
2019-04-17 04:35:54 +00:00
Upgrade Google libraries Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0. Hopefully this will solve compilation error on MSVC with C++17.
2020-06-18 11:23:12 +00:00
src/demangle.h
src/symbolize.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/utilities.h
Cleanup: use 2 space indentation for CMake
2019-04-17 04:35:54 +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
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
CMake: add missing headers
2023-06-15 23:49:56 +00:00
src/config_netbsd.h
src/config_openbsd.h
Cleanup: use 2 space indentation for CMake
2019-04-17 04:35:54 +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
src/base/commandlineflags.h
src/base/googleinit.h
src/base/mutex.h
Cleanup: use 2 space indentation for CMake
2019-04-17 04:35:54 +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
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
Upgrade Google libraries Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0. Hopefully this will solve compilation error on MSVC with C++17.
2020-06-18 11:23:12 +00:00
src/stacktrace_windows-inl.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
)
CMake: prepare for BLENDER_SORTED_LIBS removal No functional change, this adds LIB definition and args to cmake files. Without this it's difficult to migrate away from 'BLENDER_SORTED_LIBS' since there are many platforms/configurations that could break when changing linking order. Manually add and enable WITHOUT_SORTED_LIBS to try building without sorted libs (currently fails since all variables are empty). This check will eventually be removed. See T46725.
2019-04-14 13:18:44 +00:00
set(LIB
)
Cleanup: quiet redefined warning in GLOG
2023-08-17 06:09:58 +00:00
# Suppress warnings as GLOG has it's own define.
if(HAVE_EXECINFO_H)
remove_definitions(-DHAVE_EXECINFO_H)
endif()
CMake: fix building without libmv
2019-04-16 12:10:38 +00:00
if(NOT WITH_SYSTEM_GFLAGS)
list(APPEND LIB
extern_gflags
)
endif()
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
if(WIN32)
list(APPEND SRC
src/windows/port.cc
Cleanup: use 2 space indentation for CMake
2019-04-17 04:35:54 +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
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
)
Cleanup: use 2 space indentation for CMake
2019-04-17 04:35:54 +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 INC
src/windows
)
Cleanup: use term suppress instead of repress Also check MSVC instead of WIN32, for setting MSVC flags.
2020-03-12 01:13:41 +00:00
if(MSVC)
# Suppress warning about google::LogMessageFatal::~LogMessageFatal
# not returning.
add_definitions("/wd4722")
endif()
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
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
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})
CMake: prepare for BLENDER_SORTED_LIBS removal No functional change, this adds LIB definition and args to cmake files. Without this it's difficult to migrate away from 'BLENDER_SORTED_LIBS' since there are many platforms/configurations that could break when changing linking order. Manually add and enable WITHOUT_SORTED_LIBS to try building without sorted libs (currently fails since all variables are empty). This check will eventually be removed. See T46725.
2019-04-14 13:18:44 +00:00
blender_add_lib(extern_glog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
Reference in New Issue Copy Permalink