Skip to content

Commit 25d5be6

Browse files
niyueniyue
committed
Improve logging with tracing library, and make a test skeleton for running automated tests repetitively.
1 parent 76e3bd5 commit 25d5be6

20 files changed

+641
-397
lines changed

‎.clang-format

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
Language: Cpp
3+
# BasedOnStyle: LLVM
4+
ColumnLimit: 100
5+
IndentCaseLabels: true
6+
AllowShortFunctionsOnASingleLine: Empty
7+
NamespaceIndentation: All
8+
---
9+
Language: Proto
10+
# Don't format .proto files.
11+
DisableFormat: true
12+
---
13+
Language: ObjC
14+
# clang-format misunderstands some header files as Objective-C files
15+
DisableFormat: true
16+
---
17+
Language: Java
18+
ColumnLimit: 100

‎CMakeLists.txt

+51-20
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
# This file is generated by piemaker. DO NOT EDIT this file directly.
2-
3-
cmake_minimum_required(VERSION 3.15)
1+
# This file is generated by piemaker 0.9.0. DO NOT EDIT this file directly.
2+
cmake_minimum_required(VERSION 3.21)
43
set(PROJECT_NAME vectorcxx-vector)
54
set(CMAKE_CXX_STANDARD 17)
65

6+
message(STATUS "#################### PROJECT ${PROJECT_NAME} ####################")
7+
78
# https://vcpkg.readthedocs.io/en/latest/users/integration/#cmake
89
if(DEFINED ENV{VCPKG_ROOT})
910
message(STATUS "vcpkg found VCPKG_ROOT=$ENV{VCPKG_ROOT}")
1011
# https://github.com/microsoft/vcpkg/blob/master/docs/users/integration.md#changing-the-triplet-1
1112

1213
if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET})
13-
message(STATUS "using VC_DEFAULT_TRIPLET from environment $ENV{VCPKG_DEFAULT_TRIPLET}")
14+
message(STATUS "using VCPKG_DEFAULT_TRIPLET from environment $ENV{VCPKG_DEFAULT_TRIPLET}")
1415
set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}")
1516
endif()
1617

@@ -37,10 +38,21 @@ if(DEFINED ENV{VCPKG_ROOT})
3738
endif()
3839
endif()
3940

41+
option(ENABLE_TIME_TRACE "enable the time trace for compilation speed profiling" OFF)
42+
if (DEFINED ENV{ENABLE_TIME_TRACE} OR ENABLE_TIME_TRACE)
43+
message(STATUS "enable -ftime-trace for compilation profiling")
44+
45+
if (NOT (${CMAKE_CXX_FLAGS} MATCHES "-ftime-trace"))
46+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftime-trace")
47+
endif()
48+
endif()
49+
4050
project(${PROJECT_NAME})
51+
4152
if(NOT CMAKE_BUILD_TYPE)
4253
set(CMAKE_BUILD_TYPE "Debug")
4354
endif ()
55+
4456
if(NOT CMAKE_VERBOSE_BUILD)
4557
set(CMAKE_VERBOSE_BUILD "OFF")
4658
endif ()
@@ -84,6 +96,7 @@ macro(setup_dependencies)
8496

8597
find_package(ZLIB REQUIRED)
8698

99+
87100
find_library(RDKAFKA_LIBRARY NAMES rdkafka REQUIRED)
88101
if (RDKAFKA_LIBRARY)
89102
message(STATUS "[library found] library=rdkafka path=${RDKAFKA_LIBRARY}")
@@ -94,6 +107,7 @@ macro(setup_dependencies)
94107

95108

96109
find_package(OpenSSL REQUIRED)
110+
97111
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
98112
find_library(IOKIT_LIBRARY NAMES IOKit REQUIRED)
99113
if (IOKIT_LIBRARY)
@@ -178,7 +192,7 @@ function(setup_src)
178192
# for source with only header files, there is no need to link
179193
# https://cmake.org/cmake/help/v3.15/manual/cmake-buildsystem.7.html#transitive-usage-requirements
180194
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
181-
target_link_libraries(${TARGET_NAME}
195+
target_link_libraries(${TARGET_NAME}
182196
PUBLIC
183197
vectorcxx::vectorcxx
184198
ZLIB::ZLIB
@@ -192,18 +206,23 @@ function(setup_src)
192206
PRIVATE
193207
${RDKAFKA_LIBRARY}
194208
)
195-
else ()
196-
target_link_libraries(${TARGET_NAME}
197-
PUBLIC
198-
vectorcxx::vectorcxx
199-
ZLIB::ZLIB
200-
${OPENSSL_SSL_LIBRARY}
201-
${OPENSSL_CRYPTO_LIBRARY}
202-
INTERFACE
203-
PRIVATE
204-
${RDKAFKA_LIBRARY}
205-
)
206-
endif ()
209+
else()
210+
target_link_libraries(${TARGET_NAME}
211+
PUBLIC
212+
vectorcxx::vectorcxx
213+
ZLIB::ZLIB
214+
${OPENSSL_SSL_LIBRARY}
215+
${OPENSSL_CRYPTO_LIBRARY}
216+
${IOKIT_LIBRARY}
217+
${SECURITY_LIBRARY}
218+
INTERFACE
219+
PRIVATE
220+
${RDKAFKA_LIBRARY}
221+
)
222+
endif()
223+
224+
225+
207226

208227

209228
target_include_directories(${TARGET_NAME}
@@ -246,7 +265,11 @@ setup_src()
246265
########### tests #############
247266
function(setup_tests)
248267
find_package(Catch2 REQUIRED)
249-
268+
find_package(nlohmann_json REQUIRED)
269+
find_package(spdlog REQUIRED)
270+
find_package(cpr REQUIRED)
271+
find_package(fmt REQUIRED)
272+
250273
find_package(Threads REQUIRED)
251274

252275
set(TARGET_NAME vector-tests)
@@ -259,13 +282,17 @@ function(setup_tests)
259282
PRIVATE ${TARGET_SOURCES})
260283

261284
target_link_libraries(${TARGET_NAME}
262-
PUBLIC
285+
PRIVATE
263286
${PROJECT_NAME}
264287

288+
nlohmann_json::nlohmann_json
289+
spdlog::spdlog
290+
cpr::cpr
291+
fmt::fmt
265292
Catch2::Catch2
266293
)
267294
target_include_directories(${TARGET_NAME}
268-
PUBLIC
295+
PRIVATE
269296
${PROJECT_TESTS_DIR}
270297
)
271298
include(CTest)
@@ -290,3 +317,7 @@ endfunction()
290317
enable_testing()
291318
setup_tests()
292319

320+
321+
322+
323+
message(STATUS "#################### END OF PROJECT ${PROJECT_NAME} ####################")

‎CMakePresets.json

+46-39
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,118 @@
11
{
2-
"version": 2,
2+
"version": 3,
33
"cmakeMinimumRequired": {
44
"major": 3,
5-
"minor": 20,
5+
"minor": 21,
66
"patch": 0
77
},
88
"configurePresets": [
99
{
1010
"name": "default-config-preset",
1111
"binaryDir": "${sourceDir}/build-$env{CMAKE_BUILD_TYPE_PLATFORM}-x64-cmake",
12-
"generator": "Unix Makefiles",
12+
"generator": "Ninja",
1313
"environment": {
1414
"CMAKE_BUILD_TYPE_PLATFORM": "${presetName}"
1515
},
1616
"cacheVariables": {
1717
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
18-
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
19-
}
18+
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
19+
"Boost_NO_WARN_NEW_VERSIONS": "ON",
20+
"CMAKE_EXE_LINKER_FLAGS": "$env{CMAKE_LINKER_FLAGS}"
21+
},
22+
"hidden": true
2023
},
2124
{
2225
"name": "debug-config-preset",
2326
"inherits": "default-config-preset",
2427
"displayName": "Debug Preset",
2528
"cacheVariables": {
26-
"CMAKE_BUILD_TYPE": "Debug",
27-
"CMAKE_VERBOSE_BUILD": "true"
28-
}
29+
"CMAKE_BUILD_TYPE": "Debug"
30+
},
31+
"hidden": true
2932
},
3033
{
3134
"name": "relwithdebinfo-config-preset",
3235
"inherits": "default-config-preset",
3336
"displayName": "RelWithDebInfo Preset",
3437
"cacheVariables": {
3538
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
36-
}
39+
},
40+
"hidden": true
3741
},
3842
{
3943
"name": "release-config-preset",
4044
"inherits": "default-config-preset",
4145
"displayName": "Release Preset",
4246
"cacheVariables": {
4347
"CMAKE_BUILD_TYPE": "Release"
44-
}
48+
},
49+
"hidden": true
50+
},
51+
{
52+
"name": "osx-config-preset",
53+
"displayName": "macOS Preset",
54+
"condition": {
55+
"type": "equals",
56+
"lhs": "${hostSystemName}",
57+
"rhs": "Darwin"
58+
},
59+
"hidden": true
60+
},
61+
{
62+
"name": "linux-config-preset",
63+
"displayName": "Linux Preset",
64+
"condition": {
65+
"type": "equals",
66+
"lhs": "${hostSystemName}",
67+
"rhs": "Linux"
68+
},
69+
"hidden": true
4570
},
4671
{
4772
"name": "debug-osx",
48-
"inherits": "debug-config-preset"
73+
"inherits": ["debug-config-preset", "osx-config-preset"]
4974
},
5075
{
5176
"name": "debug-linux",
52-
"inherits": "debug-config-preset"
77+
"inherits": ["debug-config-preset", "linux-config-preset"]
5378
},
5479
{
5580
"name": "relwithdebinfo-osx",
56-
"inherits": "relwithdebinfo-config-preset"
81+
"inherits": ["relwithdebinfo-config-preset", "osx-config-preset"]
5782
},
5883
{
5984
"name": "relwithdebinfo-linux",
60-
"inherits": "relwithdebinfo-config-preset"
85+
"inherits": ["relwithdebinfo-config-preset", "linux-config-preset"]
6186
},
6287
{
6388
"name": "release-osx",
64-
"inherits": "release-config-preset"
89+
"inherits": ["release-config-preset", "osx-config-preset"]
6590
},
6691
{
6792
"name": "release-linux",
68-
"inherits": "release-config-preset"
69-
},
70-
{
71-
"name": "zld-debug-osx",
72-
"inherits": "debug-osx",
73-
"environment": {
74-
"CMAKE_BUILD_TYPE_PLATFORM": "debug-osx"
75-
},
76-
"cacheVariables": {
77-
"CMAKE_EXE_LINKER_FLAGS": "-fuse-ld=/usr/local/bin/zld"
78-
}
93+
"inherits": ["release-config-preset", "linux-config-preset"]
7994
}
8095
],
8196
"buildPresets": [
8297
{
8398
"name": "debug-osx-build",
99+
"jobs": 10,
84100
"configurePreset": "debug-osx"
85101
},
86102
{
87103
"name": "debug-linux-build",
104+
"jobs": 10,
88105
"configurePreset": "debug-linux"
89106
},
90107
{
91108
"name": "relwithdebinfo-osx-build",
109+
"jobs": 10,
92110
"configurePreset": "relwithdebinfo-osx"
93111
},
94112
{
95113
"name": "relwithdebinfo-linux-build",
114+
"jobs": 10,
96115
"configurePreset": "relwithdebinfo-linux"
97-
},
98-
{
99-
"name": "release-osx-build",
100-
"configurePreset": "release-osx"
101-
},
102-
{
103-
"name": "release-linux-build",
104-
"configurePreset": "release-linux"
105-
},
106-
{
107-
"name": "zld-debug-osx-build",
108-
"configurePreset": "zld-debug-osx"
109-
}
116+
}
110117
]
111118
}

0 commit comments

Comments
 (0)