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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
Description: Use the system GoogleTest
Author: Adrian Bunk <bunk@debian.org>
--- cryfs-0.11.4.orig/cmake-utils/utils.cmake
+++ cryfs-0.11.4/cmake-utils/utils.cmake
@@ -10,7 +10,7 @@ function(target_activate_cpp14 TARGET)
# Required by range-v3, see its README.md
set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD 17)
else()
- set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD 14)
+ set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD 17)
endif()
set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD_REQUIRED ON)
# Ideally, we'd like to use libc++ on linux as well, but:
--- cryfs-0.11.4.orig/test/blobstore/CMakeLists.txt
+++ cryfs-0.11.4/test/blobstore/CMakeLists.txt
@@ -27,7 +27,7 @@ set(SOURCES
)
add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blobstore)
+target_link_libraries(${PROJECT_NAME} my-gtest-main gtest gmock blobstore)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
target_enable_style_warnings(${PROJECT_NAME})
--- cryfs-0.11.4.orig/test/blockstore/CMakeLists.txt
+++ cryfs-0.11.4/test/blockstore/CMakeLists.txt
@@ -42,7 +42,7 @@ set(SOURCES
)
add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blockstore)
+target_link_libraries(${PROJECT_NAME} my-gtest-main gtest gmock blockstore)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
target_enable_style_warnings(${PROJECT_NAME})
--- cryfs-0.11.4.orig/test/cpp-utils/CMakeLists.txt
+++ cryfs-0.11.4/test/cpp-utils/CMakeLists.txt
@@ -71,7 +71,7 @@ target_activate_cpp14(${PROJECT_NAME}_ex
target_link_libraries(${PROJECT_NAME}_exit_signal cpp-utils)
add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cpp-utils)
+target_link_libraries(${PROJECT_NAME} my-gtest-main gtest gmock cpp-utils)
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_exit_status ${PROJECT_NAME}_exit_signal)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
--- cryfs-0.11.4.orig/test/cryfs-cli/CMakeLists.txt
+++ cryfs-0.11.4/test/cryfs-cli/CMakeLists.txt
@@ -16,7 +16,7 @@ set(SOURCES
)
add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs-cli cryfs-unmount fspp-fuse)
+target_link_libraries(${PROJECT_NAME} my-gtest-main gtest gmock cryfs-cli cryfs-unmount fspp-fuse)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
target_enable_style_warnings(${PROJECT_NAME})
--- cryfs-0.11.4.orig/test/cryfs/CMakeLists.txt
+++ cryfs-0.11.4/test/cryfs/CMakeLists.txt
@@ -24,7 +24,7 @@ set(SOURCES
)
add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs)
+target_link_libraries(${PROJECT_NAME} my-gtest-main gtest gmock cryfs)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
target_enable_style_warnings(${PROJECT_NAME})
--- cryfs-0.11.4.orig/test/fspp/CMakeLists.txt
+++ cryfs-0.11.4/test/fspp/CMakeLists.txt
@@ -103,7 +103,7 @@ set(SOURCES
testutils/OpenFileHandle.cpp testutils/OpenFileHandle.h)
add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} my-gtest-main googletest fspp-interface fspp-fuse)
+target_link_libraries(${PROJECT_NAME} my-gtest-main gtest gmock fspp-interface fspp-fuse)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
target_enable_style_warnings(${PROJECT_NAME})
--- cryfs-0.11.4.orig/test/gitversion/CMakeLists.txt
+++ cryfs-0.11.4/test/gitversion/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCES
)
add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} my-gtest-main googletest gitversion)
+target_link_libraries(${PROJECT_NAME} my-gtest-main gtest gmock gitversion)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
target_enable_style_warnings(${PROJECT_NAME})
--- cryfs-0.11.4.orig/test/my-gtest-main/CMakeLists.txt
+++ cryfs-0.11.4/test/my-gtest-main/CMakeLists.txt
@@ -5,7 +5,7 @@ set(SOURCES
)
add_library(${PROJECT_NAME} STATIC ${SOURCES})
-target_link_libraries(${PROJECT_NAME} PUBLIC googletest cpp-utils)
+target_link_libraries(${PROJECT_NAME} PUBLIC gtest gmock cpp-utils)
target_add_boost(${PROJECT_NAME} filesystem system)
target_include_directories(${PROJECT_NAME} PUBLIC .)
--- cryfs-0.11.4.orig/test/parallelaccessstore/CMakeLists.txt
+++ cryfs-0.11.4/test/parallelaccessstore/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCES
)
add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} my-gtest-main googletest parallelaccessstore)
+target_link_libraries(${PROJECT_NAME} my-gtest-main gtest gmock parallelaccessstore)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
target_enable_style_warnings(${PROJECT_NAME})
--- cryfs-0.11.4.orig/vendor/CMakeLists.txt
+++ cryfs-0.11.4/vendor/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_subdirectory(googletest)
+#add_subdirectory(googletest)
#add_subdirectory(cryptopp)
|
