blob: 9bf54f0e7bd54c4c9ed9c2eea161574eb3d5f31a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From 6284e504b144619411ac41092d53fc8541c84cdb Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx@gmail.com>
Date: Tue, 15 Apr 2025 13:48:00 +0200
Subject: [PATCH] system glog
Signed-off-by: Paul Zander <negril.nx@gmail.com>
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 418d2255a75..6b5cd31f9b7 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -77,7 +77,9 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
if(NOT WITH_SYSTEM_GFLAGS)
add_subdirectory(gflags)
endif()
- add_subdirectory(glog)
+ if(NOT WITH_SYSTEM_GLOG)
+ add_subdirectory(glog)
+ endif()
endif()
if(WITH_GTESTS)
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index 965d0028020..825c2141f5a 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -34,6 +34,8 @@ if(WITH_LIBMV)
${GLOG_INCLUDE_DIRS}
../guardedalloc
)
+
+ list(REMOVE_DUPLICATES INC)
list(APPEND INC_SYS
${EIGEN3_INCLUDE_DIRS}
diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLists.txt
index ff7f6905836..d46b1d65174 100644
--- a/tests/gtests/testing/CMakeLists.txt
+++ b/tests/gtests/testing/CMakeLists.txt
@@ -13,6 +13,8 @@ set(INC
${GFLAGS_INCLUDE_DIRS}
../../../extern/gtest/include
)
+
+list(REMOVE_DUPLICATES INC)
set(INC_SYS
)
--
2.49.0
From 0547b825d9ab0b7c89a41eb4000f0d2892c17d85 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx@gmail.com>
Date: Tue, 29 Apr 2025 18:22:53 +0200
Subject: [PATCH] fix-system-glog
Signed-off-by: Paul Zander <negril.nx@gmail.com>
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index fe28dfd66ce..03c17167269 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -130,6 +130,13 @@ if(CXX_HAS_AVX2)
set_source_files_properties(transform_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_FLAGS}")
endif()
+if(WITH_CYCLES_LOGGING)
+ list(APPEND LIB
+ ${GLOG_LIBRARIES}
+ ${GFLAGS_LIBRARIES}
+ )
+endif()
+
include_directories(${INC})
include_directories(SYSTEM ${INC_SYS})
--
2.49.0
|
