Skip to content

Commit 576ef59

Browse files
committed
Fix userver_module command formatting
1 parent 118ac61 commit 576ef59

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.cmake-format.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
"INCLUDE_DIRS": "*",
2020
"DBTEST_SOURCES": "*",
2121
"DBTEST_DATABASES": "*",
22+
"DBTEST_DIRS": "*",
2223
"DBTEST_ENV": "*",
24+
"DBTEST_LINK_LIBRARIES": "*",
2325
"UBENCH_DIRS": "*",
2426
"UBENCH_DATABASES": "*",
2527
"UBENCH_SOURCES": "*",
2628
"UBENCH_LINK_LIBRARIES": "*",
27-
"UBENCH_ENV" : "*",
28-
"POSTGRES_TEST_DSN" : "*",
29+
"UBENCH_ENV": "*",
30+
"POSTGRES_TEST_DSN": "*",
2931

3032
},
3133
"flags": ["NO_INSTALL"],

kafka/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ endif()
99
userver_module(
1010
kafka
1111
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
12-
LINK_LIBRARIES_PRIVATE RdKafka::rdkafka DBTEST_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests" DBTEST_LINK_LIBRARIES
13-
userver::kafka-utest
12+
LINK_LIBRARIES_PRIVATE RdKafka::rdkafka
13+
DBTEST_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests"
14+
DBTEST_LINK_LIBRARIES userver::kafka-utest
1415
DBTEST_DATABASES kafka
1516
DBTEST_ENV
1617
"TESTSUITE_KAFKA_SERVER_START_TIMEOUT=120.0" "TESTSUITE_KAFKA_SERVER_HOST=[::1]"

mysql/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ find_package(libmariadb REQUIRED)
77
userver_module(
88
mysql
99
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
10-
LINK_LIBRARIES_PRIVATE libmariadb ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto DBTEST_DIRS
11-
"${CMAKE_CURRENT_SOURCE_DIR}/tests"
10+
LINK_LIBRARIES_PRIVATE libmariadb ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto
11+
DBTEST_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests"
1212
UTEST_LINK_LIBRARIES libmariadb
1313
DBTEST_DATABASES mysql
1414
UBENCH_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks"

0 commit comments

Comments
 (0)