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:
parent
74eda0b6fc
commit
870930bc32
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Reference in New Issue