tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix build error using WITH_CYCLES_LOGGING=OFF 

Mismatch between glog and stubs. CHECK_NULL does not exist also. Tests
also require logging to be available.
This commit is contained in:
Brecht Van Lommel 2023-04-17 20:19:47 +02:00
parent 74eda0b6fc
commit 870930bc32
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/test/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright 2011-2022 Blender Foundation
if(WITH_GTESTS)
if(WITH_GTESTS AND WITH_CYCLES_LOGGING)
Include(GTestTesting)
# Otherwise we get warnings here that we can't fix in external projects
@ -53,6 +53,6 @@ if(NOT APPLE)
endif()
endif()
if(WITH_GTESTS)
if(WITH_GTESTS AND WITH_CYCLES_LOGGING)
blender_src_gtest(cycles "${SRC}" "${LIB}")
endif()

6
intern/cycles/util/log.h
View File

@ -36,8 +36,7 @@ class LogMessageVoidify {
# define CHECK(expression) LOG_SUPPRESS()
# define CHECK_NOTNULL(expression) LOG_SUPPRESS()
# define CHECK_NULL(expression) LOG_SUPPRESS()
# define CHECK_NOTNULL(expression) (expression)
# define CHECK_NEAR(actual, expected, eps) LOG_SUPPRESS()
@ -50,8 +49,7 @@ class LogMessageVoidify {
# define DCHECK(expression) LOG_SUPPRESS()
# define DCHECK_NOTNULL(expression) LOG_SUPPRESS()
# define DCHECK_NULL(expression) LOG_SUPPRESS()
# define DCHECK_NOTNULL(expression) (expression)
# define DCHECK_NEAR(actual, expected, eps) LOG_SUPPRESS()