8000 [cmake] Ignore user presets (#17904) · rohankumardubey/arangodb@89fa5af · GitHub
[go: up one dir, main page]
Skip to content

Commit 89fa5af

Browse files
jvolmerjvolmer
authored
[cmake] Ignore user presets (arangodb#17904)
* Ignore CMakeUserPresets * Link zkd tests into arangodbtests * Reformat
1 parent 2e1169d commit 89fa5af

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ p/
5959
!core.h
6060
TAGS
6161

62+
CMakeUserPresets.json
6263
CPackConfig.cmake
6364
CPackSourceConfig.cmake
6465
CTestTestfile.cmake

‎tests/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@ set(ARANGODB_TESTS_SOURCES
279279
VocBase/VersionTest.cpp
280280
VocBase/VocbaseTest.cpp
281281
VPackDeserializer/BasicTests.cpp
282-
Zkd/Conversion.cpp
283-
Zkd/Library.cpp
284282
Cluster/ShardAutoRebalancerTest.cpp)
285283

286284
if (LINUX)
@@ -313,6 +311,7 @@ target_link_libraries(arangodbtests
313311
arango_tests_replication2
314312
arango_tests_graph
315313
arango_tests_futures
314+
arango_tests_zkd
316315
arango_agency
317316
arango_cluster_engine
318317
arango_rocksdb

‎tests/Futures/CMakeLists.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@ add_library(arango_tests_futures OBJECT
22
FutureTest.cpp
33
PromiseTest.cpp
44
TryTest.cpp)
5-
65
target_link_libraries(arango_tests_futures
6+
PRIVATE
77
arango_futures
88
gtest
99
velocypack
1010
fmt)
1111

12-
add_executable(arangodbtests_futures
13-
EXCLUDE_FROM_ALL)
14-
12+
add_executable(arangodbtests_futures EXCLUDE_FROM_ALL)
1513
target_link_libraries(arangodbtests_futures
16-
arango_crashhandler_light
17-
gtest_main
18-
arango_tests_futures)
14+
arango_crashhandler_light
15+
gtest_main
16+
arango_tests_futures)
1917

2018
add_test(NAME futures
2119
COMMAND arangodbtests_futures)

‎tests/Zkd/CMakeLists.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
add_executable(arangodbtests_zkd EXCLUDE_FROM_ALL
1+
add_library(arango_tests_zkd OBJECT
22
Conversion.cpp
3-
Library.cpp
4-
main.cpp)
3+
Library.cpp)
4+
target_link_libraries(arango_tests_zkd
5+
PRIVATE
6+
arango_rocksdb
7+
gtest)
8+
target_include_directories(arango_tests_zkd
9+
PRIVATE
10+
${PROJECT_SOURCE_DIR}/arangod)
511

12+
add_executable(arangodbtests_zkd EXCLUDE_FROM_ALL)
613
target_link_libraries(arangodbtests_zkd
7-
arango_rocksdb
8-
gtest)
9-
10-
target_include_directories(arangodbtests_zkd PRIVATE
11-
${PROJECT_SOURCE_DIR}/arangod)
14+
arango_tests_zkd
15+
gtest_main)
1216

1317
add_test(NAME zkd
1418
COMMAND arangodbtests_zkd)

0 commit comments

Comments
 (0)
0