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
|
From: =?utf-8?q?Timo_R=C3=B6hling?= <timo@gaussglocke.de>
Date: Wed, 2 Dec 2020 13:32:16 +0100
Subject: Use system Googletest sources
---
cmake/draco_build_definitions.cmake | 8 ++++----
cmake/draco_tests.cmake | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmake/draco_build_definitions.cmake b/cmake/draco_build_definitions.cmake
index c1ada62..5fe56c3 100644
--- a/cmake/draco_build_definitions.cmake
+++ b/cmake/draco_build_definitions.cmake
@@ -47,10 +47,10 @@ macro(draco_set_build_definitions)
list(APPEND draco_gtest_include_paths
- "${draco_root}/../googletest/googlemock/include"
- "${draco_root}/../googletest/googlemock"
- "${draco_root}/../googletest/googletest/include"
- "${draco_root}/../googletest/googletest")
+ "/usr/src/googletest/googlemock/include"
+ "/usr/src/googletest/googlemock"
+ "/usr/src/googletest/googletest/include"
+ "/usr/src/googletest/googletest")
list(APPEND draco_test_include_paths ${draco_include_paths}
${draco_gtest_include_paths})
list(APPEND draco_defines "DRACO_CMAKE=1"
diff --git a/cmake/draco_tests.cmake b/cmake/draco_tests.cmake
index a6dfc5b..e10009c 100644
--- a/cmake/draco_tests.cmake
+++ b/cmake/draco_tests.cmake
@@ -55,9 +55,9 @@ list(
"${draco_src_root}/point_cloud/point_cloud_test.cc")
list(APPEND draco_gtest_all
- "${draco_root}/../googletest/googletest/src/gtest-all.cc")
+ "/usr/src/googletest/googletest/src/gtest-all.cc")
list(APPEND draco_gtest_main
- "${draco_root}/../googletest/googletest/src/gtest_main.cc")
+ "/usr/src/googletest/googletest/src/gtest_main.cc")
macro(draco_setup_test_targets)
if(DRACO_TESTS)
|
