From 0ffd288fab5686f55d68d0d39baf59568f4389e7 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Sun, 18 Sep 2022 07:41:13 +0200
Subject: Build: fix gtest build flags affecting actual library

Switch to target_ functions to avoid this.
---
 intern/guardedalloc/CMakeLists.txt | 1 +
 intern/opensubdiv/CMakeLists.txt   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'intern')

diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 89fdf367037..0d16879adb5 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -7,6 +7,7 @@ endif()
 
 set(INC
   .
+  ..
   ../atomic
 )
 
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index 596534fc82c..7df1a94bbd8 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -110,7 +110,6 @@ if(WITH_GTESTS AND WITH_OPENSUBDIV)
 
   add_definitions(${GFLAGS_DEFINES})
   add_definitions(${GLOG_DEFINES})
-  add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
 
   blender_add_test_executable(opensubdiv_mesh_topology_test "internal/topology/mesh_topology_test.cc" "${INC}" "${INC_SYS}" "${LIB};bf_intern_opensubdiv")
 endif()
-- 
cgit v1.2.3