Skip to content

Commit e859a97

Browse files
an-taoan-tao
committed
Format CMakeLists
1 parent 32591ea commit e859a97

File tree

4 files changed

+59
-65
lines changed

4 files changed

+59
-65
lines changed

‎CMakeLists.txt

Lines changed: 57 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,27 @@ set(TRANTOR_MAJOR_VERSION 1)
55
set(TRANTOR_MINOR_VERSION 0)
66
set(TRANTOR_PATCH_VERSION 0)
77
set(TRANTOR_VERSION
8-
${TRANTOR_MAJOR_VERSION}.${TRANTOR_MINOR_VERSION}.${TRANTOR_PATCH_VERSION})
8+
${TRANTOR_MAJOR_VERSION}.${TRANTOR_MINOR_VERSION}.${TRANTOR_PATCH_VERSION})
99

1010
# Offer the user the choice of overriding the installation directories
1111
set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
12-
set(INSTALL_INCLUDE_DIR include CACHE PATH
13-
"Installation directory for header files")
12+
set(INSTALL_INCLUDE_DIR
13+
include
14+
CACHE PATH "Installation directory for header files")
1415
if(WIN32 AND NOT CYGWIN)
1516
set(DEF_INSTALL_TRANTOR_CMAKE_DIR cmake)
1617
else()
1718
set(DEF_INSTALL_TRANTOR_CMAKE_DIR lib/cmake/Trantor)
1819
endif()
19-
set(INSTALL_TRANTOR_CMAKE_DIR ${DEF_INSTALL_TRANTOR_CMAKE_DIR} CACHE PATH
20-
"Installation directory for cmake files")
20+
set(INSTALL_TRANTOR_CMAKE_DIR
21+
${DEF_INSTALL_TRANTOR_CMAKE_DIR}
22+
CACHE PATH "Installation directory for cmake files")
2123

2224
# Make relative paths absolute (needed later on)
23-
foreach(p LIB INCLUDE TRANTOR_CMAKE)
25+
foreach(p
26+
LIB
27+
INCLUDE
28+
TRANTOR_CMAKE)
2429
set(var INSTALL_${p}_DIR)
2530
if(NOT IS_ABSOLUTE "${${var}}")
2631
set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
@@ -34,8 +39,7 @@ target_include_directories(${PROJECT_NAME}
3439
PRIVATE ${PROJECT_SOURCE_DIR}
3540
${PROJECT_SOURCE_DIR}/trantor/utils
3641
${PROJECT_SOURCE_DIR}/trantor/net
37-
${PROJECT_SOURCE_DIR}/trantor/net/inner
38-
)
42+
${PROJECT_SOURCE_DIR}/trantor/net/inner)
3943

4044
set(TRANTOR_SOURCES
4145
trantor/utils/AsyncFileLogger.cc
@@ -63,34 +67,35 @@ set(TRANTOR_SOURCES
6367
trantor/net/inner/poller/EpollPoller.cc
6468
trantor/net/inner/poller/KQueue.cc)
6569

66-
find_package (OpenSSL)
70+
find_package(OpenSSL)
6771
if(OpenSSL_FOUND)
68-
target_include_directories(${PROJECT_NAME} PRIVATE ${OPENSSL_INCLUDE_DIR})
69-
target_link_libraries(${PROJECT_NAME} PRIVATE ${OPENSSL_LIBRARIES})
70-
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/ssl/SSLConnection.cc)
72+
target_include_directories(${PROJECT_NAME} PRIVATE ${OPENSSL_INCLUDE_DIR})
73+
target_link_libraries(${PROJECT_NAME} PRIVATE ${OPENSSL_LIBRARIES})
74+
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/ssl/SSLConnection.cc)
7175
else()
72-
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/ssl/SSLConnectionSkipped.cc)
76+
set(TRANTOR_SOURCES ${TRANTOR_SOURCES}
77+
trantor/net/ssl/SSLConnectionSkipped.cc)
7378
endif()
7479

7580
find_path(CARES_INCLUDE_DIR ares.h)
7681
find_library(CARES_LIBRARY NAMES cares)
7782
if(CARES_INCLUDE_DIR AND CARES_LIBRARY)
78-
target_include_directories(${PROJECT_NAME} PRIVATE ${CARES_INCLUDE_DIR})
79-
target_link_libraries(${PROJECT_NAME} INTERFACE ${CARES_LIBRARY})
80-
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc)
83+
target_include_directories(${PROJECT_NAME} PRIVATE ${CARES_INCLUDE_DIR})
84+
target_link_libraries(${PROJECT_NAME} INTERFACE ${CARES_LIBRARY})
85+
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc)
8186
else()
82-
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/NormalResolver.cc)
87+
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/NormalResolver.cc)
8388
endif()
8489
target_sources(${PROJECT_NAME} PRIVATE ${TRANTOR_SOURCES})
8590
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_14)
8691
target_link_libraries(${PROJECT_NAME} PRIVATE pthread)
8792

8893
if(MAKETEST STREQUAL YES)
89-
add_subdirectory(trantor/tests)
90-
find_package(GTest)
91-
if(GTest_FOUND)
92-
add_subdirectory(trantor/unittests)
93-
endif()
94+
add_subdirectory(trantor/tests)
95+
find_package(GTest)
96+
if(GTest_FOUND)
97+
add_subdirectory(trantor/unittests)
98+
endif()
9499
endif()
95100

96101
set(public_net_headers
@@ -103,7 +108,7 @@ set(public_net_headers
103108
trantor/net/TcpServer.h
104109
trantor/net/callbacks.h
105110
trantor/net/Resolver.h)
106-
111+
107112
set(public_utils_headers
108113
trantor/utils/AsyncFileLogger.h
109114
trantor/utils/ConcurrentTaskQueue.h
@@ -119,34 +124,44 @@ set(public_utils_headers
119124
trantor/utils/TaskQueue.h
120125
trantor/utils/TimingWheel.h)
121126

122-
source_group( "Public API" FILES ${public_net_headers} ${public_utils_headers})
127+
source_group("Public API"
128+
FILES
129+
${public_net_headers}
130+
${public_utils_headers})
123131

124132
install(TARGETS trantor
125-
# IMPORTANT: Add the trantor library to the "export-set"
126-
EXPORT TrantorTargets
127-
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT lib)
133+
# IMPORTANT: Add the trantor library to the "export-set"
134+
EXPORT TrantorTargets
135+
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT lib)
128136

129-
install(FILES ${public_net_headers} DESTINATION ${INSTALL_INCLUDE_DIR}/trantor/net)
130-
install(FILES ${public_utils_headers} DESTINATION ${INSTALL_INCLUDE_DIR}/trantor/utils)
137+
install(FILES ${public_net_headers}
138+
DESTINATION ${INSTALL_INCLUDE_DIR}/trantor/net)
139+
install(FILES ${public_utils_headers}
140+
DESTINATION ${INSTALL_INCLUDE_DIR}/trantor/utils)
131141

132142
include(CMakePackageConfigHelpers)
133143
# ... for the install tree
134-
configure_package_config_file(cmake/templates/TrantorConfig.cmake.in
135-
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TrantorConfig.cmake
136-
INSTALL_DESTINATION ${INSTALL_TRANTOR_CMAKE_DIR})
144+
configure_package_config_file(
145+
cmake/templates/TrantorConfig.cmake.in
146+
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TrantorConfig.cmake
147+
INSTALL_DESTINATION
148+
${INSTALL_TRANTOR_CMAKE_DIR})
137149

138150
# version
139-
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/TrantorConfigVersion.cmake
140-
VERSION ${TRANTOR_VERSION}
141-
COMPATIBILITY SameMajorVersion)
151+
write_basic_package_version_file(
152+
${CMAKE_CURRENT_BINARY_DIR}/TrantorConfigVersion.cmake
153+
VERSION ${TRANTOR_VERSION}
154+
COMPATIBILITY SameMajorVersion)
142155

143156
# Install the TrantorConfig.cmake and TrantorConfigVersion.cmake
144-
install(FILES
145-
"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TrantorConfig.cmake"
146-
"${CMAKE_CURRENT_BINARY_DIR}/TrantorConfigVersion.cmake"
147-
DESTINATION "${INSTALL_TRANTOR_CMAKE_DIR}" COMPONENT dev)
157+
install(
158+
FILES
159+
"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TrantorConfig.cmake"
160+
"${CMAKE_CURRENT_BINARY_DIR}/TrantorConfigVersion.cmake"
161+
DESTINATION "${INSTALL_TRANTOR_CMAKE_DIR}"
162+
COMPONENT dev)
148163

149164
# Install the export set for use with the install-tree
150-
install(EXPORT TrantorTargets
151-
DESTINATION "${INSTALL_TRANTOR_CMAKE_DIR}" COMPONENT dev)
152-
165+
install(EXPORT TrantorTargets
166+
DESTINATION "${INSTALL_TRANTOR_CMAKE_DIR}"
167+
COMPONENT dev)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Drawing on the design of Muduo Library
99
## Dependence
1010

1111
gcc 5.4.0 or newer;
12-
cmake 3.2 or newer;
12+
cmake 3.6 or newer;
1313
linux kernel 2.6.9 x86-64 or newer;

‎trantor/tests/CMakeLists.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,3 @@ target_link_libraries(kickoff_test PRIVATE trantor pthread)
5252
add_executable(dns_test DnsTest.cc)
5353
target_link_libraries(dns_test PRIVATE trantor pthread)
5454

55-
SET(targets_list ssl_server_test
56-
ssl_client_test
57-
serial_task_queue_test1
58-
serial_task_queue_test2
59-
timer_test
60-
timer_test1
61-
run_in_loop_test1
62-
run_in_loop_test2
63-
logger_test
64-
async_file_logger_test
65-
tcp_server_test
66-
concurrent_task_queue_test
67-
tcp_client_test
68-
async_file_logger_test1
69-
sendfile_test
70-
timing_wheel_test
71-
kickoff_test
72-
dns_test)
73-
74-

‎trantor/unittests/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
21
find_package(GTest REQUIRED)
32
add_executable(msgbuffer_unittest MsgBufferUnittest.cc)
43
target_link_libraries(msgbuffer_unittest PRIVATE trantor GTest::GTest)
54
add_executable(inetaddress_unittest InetAddressUnittest.cc)
65
target_link_libraries(inetaddress_unittest PRIVATE trantor GTest::GTest)
76
add_executable(date_unittest DateUnittest.cc)
8-
target_link_libraries(date_unittest PRIVATE trantor GTest::GTest)
7+
target_link_libraries(date_unittest PRIVATE trantor GTest::GTest)

0 commit comments

Comments
 (0)