File tree Expand file tree Collapse file tree 4 files changed +33
-3
lines changed Expand file tree Collapse file tree 4 files changed +33
-3
lines changed Original file line number Diff line number Diff line change 1
- cmake_minimum_required (VERSION 3.6 )
1
+ cmake_minimum_required (VERSION 3.5 )
2
2
project (trantor )
3
3
add_library (${PROJECT_NAME} STATIC )
4
4
set (TRANTOR_MAJOR_VERSION 1 )
@@ -87,9 +87,12 @@ else()
87
87
set (TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/NormalResolver.cc )
88
88
endif ()
89
89
target_sources (${PROJECT_NAME} PRIVATE ${TRANTOR_SOURCES} )
90
- target_compile_features (${PROJECT_NAME} PUBLIC cxx_std_14 )
91
90
target_link_libraries (${PROJECT_NAME} PRIVATE pthread )
92
91
92
+ set_target_properties (${PROJECT_NAME} PROPERTIES CXX_STANDARD 14 )
93
+ set_target_properties (${PROJECT_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON )
94
+ set_target_properties (${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF )
95
+
93
96
if (MAKETEST STREQUAL YES )
94
97
add_subdirectory (trantor/tests )
95
98
find_package (GTest )
Original file line number Diff line number Diff line change @@ -9,5 +9,5 @@ Drawing on the design of Muduo Library
9
9
## Dependence
10
10
11
11
gcc 5.4.0 or newer;
12
- cmake 3.6 or newer;
12
+ cmake 3.5 or newer;
13
13
linux kernel 2.6.9 x86-64 or newer;
Original file line number Diff line number Diff line change @@ -52,3 +52,26 @@ target_link_libraries(kickoff_test PRIVATE trantor pthread)
52
52
add_executable (dns_test DnsTest.cc )
53
53
target_link_libraries (dns_test PRIVATE trantor pthread )
54
54
55
+ set (targets_list
56
+ ssl_server_test
57
+ ssl_client_test
58
+ serial_task_queue_test1
59
+ serial_task_queue_test2
60
+ timer_test
61
+ timer_test1
62
+ run_in_loop_test1
63
+ run_in_loop_test2
64
+ logger_test
65
+ async_file_logger_test
66
+ tcp_server_test
67
+ concurrent_task_queue_test
68
+ tcp_client_test
69
+ async_file_logger_test1
70
+ sendfile_test
71
+ timing_wheel_test
72
+ kickoff_test
73
+ dns_test )
74
+
75
+ set_property (TARGET ${targets_list} PROPERTY CXX_STANDARD 14 )
76
+ set_property (TARGET ${targets_list} PROPERTY CXX_STANDARD_REQUIRED ON )
77
+ set_property (TARGET ${targets_list} PROPERTY CXX_EXTENSIONS OFF )
Original file line number Diff line number Diff line change @@ -5,3 +5,7 @@ add_executable(inetaddress_unittest InetAddressUnittest.cc)
5
5
target_link_libraries (inetaddress_unittest PRIVATE trantor GTest::GTest )
6
6
add_executable (date_unittest DateUnittest.cc )
7
7
target_link_libraries (date_unittest PRIVATE trantor GTest::GTest )
8
+ set (UNITTEST_TARGETS msgbuffer_unittest inetaddress_unittest date_unittest )
9
+ set_property (TARGET ${UNITTEST_TARGETS} PROPERTY CXX_STANDARD 14 )
10
+ set_property (TARGET ${UNITTEST_TARGETS} PROPERTY CXX_STANDARD_REQUIRED ON )
11
+ set_property (TARGET ${UNITTEST_TARGETS} PROPERTY CXX_EXTENSIONS OFF )
You can’t perform that action at this time.
0 commit comments