Skip to content

Commit 0e76b37

Browse files
rusloruslo
committed
Apply adapt_sugar_functions.py
1 parent 021afc3 commit 0e76b37

File tree

7 files changed

+84
-61
lines changed

7 files changed

+84
-61
lines changed

‎libs/mime/test/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
include_directories(${CPP-NETLIB_SOURCE_DIR})
2+
3+
include(sugar_add_executable)
4+
include(sugar_add_gtest)
5+
include(sugar_target_link_libraries)
26
find_package ( Boost 1.41.0 COMPONENTS unit_test_framework )
37
set ( Boost_USE_STATIC_LIBS ON )
48
set ( Boost_USE_MULTITHREADED ON )
59

610
if ( Boost_FOUND )
7-
add_executable ( mime-roundtrip mime-roundtrip.cpp )
8-
target_link_libraries ( mime-roundtrip ${Boost_LIBRARIES} )
9-
add_test ( mime-roundtrip mime-roundtrip )
11+
sugar_add_executable ( mime-roundtrip mime-roundtrip.cpp )
12+
sugar_target_link_libraries ( mime-roundtrip ${Boost_LIBRARIES} )
13+
sugar_add_gtest ( mime-roundtrip mime-roundtrip )
1014
endif ()
1115

‎libs/network/build/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
include_directories(${CPP-NETLIB_SOURCE_DIR})
2+
3+
include(sugar_add_library)
24
find_package( Boost 1.45.0 COMPONENTS unit_test_framework system regex thread filesystem )
35

4-
add_library(cppnetlib-uri STATIC ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/parse_uri_impl.cpp)
5-
add_library(cppnetlib-server-parsers STATIC ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/server_request_parsers_impl.cpp)
6+
sugar_add_library(cppnetlib-uri STATIC ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/parse_uri_impl.cpp)
7+
sugar_add_library(cppnetlib-server-parsers STATIC ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/server_request_parsers_impl.cpp)
68

‎libs/network/example/CMakeLists.txt

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,23 @@
33
# (See accompanying file LICENSE_1_0.txt or copy at
44
# http://www.boost.org/LICENSE_1_0.txt)
55

6+
include(sugar_add_executable)
7+
include(sugar_target_link_libraries)
8+
69
include_directories(${CPP-NETLIB_SOURCE_DIR})
710
if (OPENSSL_FOUND)
811
include_directories(${OPENSSL_INCLUDE_DIR})
912
endif (OPENSSL_FOUND)
1013

11-
add_executable(http_client http_client.cpp)
12-
add_executable(simple_wget simple_wget.cpp)
13-
add_executable(atom_reader atom/atom.cpp atom/main.cpp)
14-
add_executable(rss_reader rss/rss.cpp rss/main.cpp)
15-
add_executable(twitter_search twitter/search.cpp)
16-
add_executable(hello_world_server http/hello_world_server.cpp)
17-
add_executable(hello_world_client http/hello_world_client.cpp)
14+
sugar_add_executable(http_client http_client.cpp)
15+
sugar_add_executable(simple_wget simple_wget.cpp)
16+
sugar_add_executable(atom_reader atom/atom.cpp atom/main.cpp)
17+
sugar_add_executable(rss_reader rss/rss.cpp rss/main.cpp)
18+
sugar_add_executable(twitter_search twitter/search.cpp)
19+
sugar_add_executable(hello_world_server http/hello_world_server.cpp)
20+
sugar_add_executable(hello_world_client http/hello_world_client.cpp)
1821
if (UNIX)
19-
add_executable(fileserver http/fileserver.cpp)
22+
sugar_add_executable(fileserver http/fileserver.cpp)
2023
endif (UNIX)
2124
add_dependencies(http_client cppnetlib-uri cppnetlib-client-connections)
2225
add_dependencies(simple_wget cppnetlib-uri cppnetlib-client-connections)
@@ -40,74 +43,74 @@ set(BOOST_SERVER_LIBS
4043
${Boost_FILESYSTEM_LIBRARY}
4144
${Boost_CHRONO_LIBRARY})
4245

43-
target_link_libraries(http_client
46+
sugar_target_link_libraries(http_client
4447
${BOOST_CLIENT_LIBS}
4548
${CMAKE_THREAD_LIBS_INIT}
4649
cppnetlib-uri
4750
cppnetlib-client-connections)
4851

49-
target_link_libraries(simple_wget
52+
sugar_target_link_libraries(simple_wget
5053
${BOOST_CLIENT_LIBS}
5154
${CMAKE_THREAD_LIBS_INIT}
5255
cppnetlib-uri
5356
cppnetlib-client-connections)
5457

55-
target_link_libraries(atom_reader
58+
sugar_target_link_libraries(atom_reader
5659
${BOOST_CLIENT_LIBS}
5760
${CMAKE_THREAD_LIBS_INIT}
5861
cppnetlib-uri
5962
cppnetlib-client-connections)
6063

61-
target_link_libraries(rss_reader
64+
sugar_target_link_libraries(rss_reader
6265
${BOOST_CLIENT_LIBS}
6366
${CMAKE_THREAD_LIBS_INIT}
6467
cppnetlib-uri
6568
cppnetlib-client-connections)
6669

67-
target_link_libraries(twitter_search
70+
sugar_target_link_libraries(twitter_search
6871
${BOOST_CLIENT_LIBS}
6972
${CMAKE_THREAD_LIBS_INIT}
7073
cppnetlib-uri
7174
cppnetlib-client-connections)
7275

73-
target_link_libraries(hello_world_server
76+
sugar_target_link_libraries(hello_world_server
7477
${BOOST_SERVER_LIBS}
7578
${CMAKE_THREAD_LIBS_INIT})
7679

77-
target_link_libraries(hello_world_client
80+
sugar_target_link_libraries(hello_world_client
7881
${BOOST_CLIENT_LIBS}
7982
${CMAKE_THREAD_LIBS_INIT}
8083
cppnetlib-uri
8184
cppnetlib-client-connections)
8285

8386
if (OPENSSL_FOUND)
84-
target_link_libraries(http_client ${OPENSSL_LIBRARIES})
85-
target_link_libraries(simple_wget ${OPENSSL_LIBRARIES})
86-
target_link_libraries(atom_reader ${OPENSSL_LIBRARIES})
87-
target_link_libraries(rss_reader ${OPENSSL_LIBRARIES})
88-
target_link_libraries(twitter_search ${OPENSSL_LIBRARIES})
89-
target_link_libraries(hello_world_server ${OPENSSL_LIBRARIES})
90-
target_link_libraries(hello_world_client ${OPENSSL_LIBRARIES})
87+
sugar_target_link_libraries(http_client ${OPENSSL_LIBRARIES})
88+
sugar_target_link_libraries(simple_wget ${OPENSSL_LIBRARIES})
89+
sugar_target_link_libraries(atom_reader ${OPENSSL_LIBRARIES})
90+
sugar_target_link_libraries(rss_reader ${OPENSSL_LIBRARIES})
91+
sugar_target_link_libraries(twitter_search ${OPENSSL_LIBRARIES})
92+
sugar_target_link_libraries(hello_world_server ${OPENSSL_LIBRARIES})
93+
sugar_target_link_libraries(hello_world_client ${OPENSSL_LIBRARIES})
9194
endif (OPENSSL_FOUND)
9295

9396
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
94-
target_link_libraries(http_client rt)
95-
target_link_libraries(simple_wget rt)
96-
target_link_libraries(atom_reader rt)
97-
target_link_libraries(rss_reader rt)
98-
target_link_libraries(twitter_search rt)
99-
target_link_libraries(hello_world_server rt)
100-
target_link_libraries(hello_world_client rt)
97+
sugar_target_link_libraries(http_client rt)
98+
sugar_target_link_libraries(simple_wget rt)
99+
sugar_target_link_libraries(atom_reader rt)
100+
sugar_target_link_libraries(rss_reader rt)
101+
sugar_target_link_libraries(twitter_search rt)
102+
sugar_target_link_libraries(hello_world_server rt)
103+
sugar_target_link_libraries(hello_world_client rt)
101104
endif()
102105

103106
if (UNIX)
104-
target_link_libraries(fileserver
107+
sugar_target_link_libraries(fileserver
105108
${BOOST_SERVER_LIBS}
106109
${Boost_FILESYSTEM_LIBRARY}
107110
${CMAKE_THREAD_LIBS_INIT}
108111
cppnetlib-server-parsers)
109112
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
110-
target_link_libraries(fileserver rt)
113+
sugar_target_link_libraries(fileserver rt)
111114
endif()
112115
endif (UNIX)
113116

‎libs/network/src/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
# (See accompanying file LICENSE_1_0.txt or copy at
66
# http://www.boost.org/LICENSE_1_0.txt)
77

8+
include(sugar_add_library)
9+
810

911
include_directories(${CPP-NETLIB_SOURCE_DIR})
1012

1113
set(CPP-NETLIB_URI_SRCS uri/uri.cpp uri/schemes.cpp)
12-
add_library(cppnetlib-uri ${CPP-NETLIB_URI_SRCS})
14+
sugar_add_library(cppnetlib-uri ${CPP-NETLIB_URI_SRCS})
1315

1416
set(CPP-NETLIB_HTTP_SERVER_SRCS server_request_parsers_impl.cpp)
15-
add_library(cppnetlib-server-parsers ${CPP-NETLIB_HTTP_SERVER_SRCS})
17+
sugar_add_library(cppnetlib-server-parsers ${CPP-NETLIB_HTTP_SERVER_SRCS})
1618

1719
set(CPP-NETLIB_HTTP_CLIENT_SRCS client.cpp)
18-
add_library(cppnetlib-client-connections ${CPP-NETLIB_HTTP_CLIENT_SRCS})
20+
sugar_add_library(cppnetlib-client-connections ${CPP-NETLIB_HTTP_CLIENT_SRCS})

‎libs/network/test/CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
# (See accompanying file LICENSE_1_0.txt or copy at
44
# http://www.boost.org/LICENSE_1_0.txt)
55

6+
include(sugar_add_executable)
7+
include(sugar_add_gtest)
8+
include(sugar_target_link_libraries)
9+
610
include_directories(${CPP-NETLIB_SOURCE_DIR})
711

812
add_subdirectory(uri)
@@ -20,18 +24,18 @@ if (Boost_FOUND)
2024
set_source_files_properties(${test}.cpp
2125
PROPERTIES COMPILE_FLAGS "-Wall")
2226
endif()
23-
add_executable(cpp-netlib-${test} ${test}.cpp)
27+
sugar_add_executable(cpp-netlib-${test} ${test}.cpp)
2428
add_dependencies(cpp-netlib-${test} cppnetlib-uri)
25-
target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
29+
sugar_target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
2630
if (OPENSSL_FOUND)
27-
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
31+
sugar_target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
2832
endif()
2933
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
30-
target_link_libraries(cpp-netlib-${test} rt)
34+
sugar_target_link_libraries(cpp-netlib-${test} rt)
3135
endif()
3236
set_target_properties(cpp-netlib-${test}
3337
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
34-
add_test(cpp-netlib-${test}
38+
sugar_add_gtest(cpp-netlib-${test}
3539
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
3640
endforeach (test)
3741

‎libs/network/test/http/CMakeLists.txt

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
# (See accompanying file LICENSE_1_0.txt or copy at
55
# http://www.boost.org/LICENSE_1_0.txt)
66

7+
include(sugar_add_executable)
8+
include(sugar_add_gtest)
9+
include(sugar_target_link_libraries)
10+
711
include_directories(${CPP-NETLIB_SOURCE_DIR})
812

913
if (OPENSSL_FOUND)
@@ -21,18 +25,18 @@ if (Boost_FOUND)
2125
set_source_files_properties(${test}.cpp
2226
PROPERTIES COMPILE_FLAGS "-Wall")
2327
endif()
24-
add_executable(cpp-netlib-http-${test} ${test}.cpp)
28+
sugar_add_executable(cpp-netlib-http-${test} ${test}.cpp)
2529
add_dependencies(cpp-netlib-http-${test}
2630
cppnetlib-uri)
27-
target_link_libraries(cpp-netlib-http-${test}
31+
sugar_target_link_libraries(cpp-netlib-http-${test}
2832
${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
2933
cppnetlib-uri)
3034
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
31-
target_link_libraries(cpp-netlib-http-${test} rt)
35+
sugar_target_link_libraries(cpp-netlib-http-${test} rt)
3236
endif()
3337
set_target_properties(cpp-netlib-http-${test}
3438
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
35-
add_test(cpp-netlib-http-${test}
39+
sugar_add_gtest(cpp-netlib-http-${test}
3640
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
3741
endforeach (test)
3842
set ( TESTS
@@ -47,23 +51,23 @@ if (Boost_FOUND)
4751
set_source_files_properties(${test}.cpp
4852
PROPERTIES COMPILE_FLAGS "-Wall")
4953
endif()
50-
add_executable(cpp-netlib-http-${test} ${test}.cpp)
54+
sugar_add_executable(cpp-netlib-http-${test} ${test}.cpp)
5155
add_dependencies(cpp-netlib-http-${test}
5256
cppnetlib-uri
5357
cppnetlib-client-connections)
54-
target_link_libraries(cpp-netlib-http-${test}
58+
sugar_target_link_libraries(cpp-netlib-http-${test}
5559
${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
5660
cppnetlib-uri
5761
cppnetlib-client-connections)
5862
if (OPENSSL_FOUND)
59-
target_link_libraries(cpp-netlib-http-${test} ${OPENSSL_LIBRARIES})
63+
sugar_target_link_libraries(cpp-netlib-http-${test} ${OPENSSL_LIBRARIES})
6064
endif()
6165
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
62-
target_link_libraries(cpp-netlib-http-${test} rt)
66+
sugar_target_link_libraries(cpp-netlib-http-${test} rt)
6367
endif()
6468
set_target_properties(cpp-netlib-http-${test}
6569
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
66-
add_test(cpp-netlib-http-${test}
70+
sugar_add_gtest(cpp-netlib-http-${test}
6771
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
6872
endforeach (test)
6973

@@ -76,15 +80,15 @@ if (Boost_FOUND)
7680
set_source_files_properties(${test}.cpp
7781
PROPERTIES COMPILE_FLAGS "-Wall")
7882
endif()
79-
add_executable(cpp-netlib-http-${test} ${test}.cpp)
83+
sugar_add_executable(cpp-netlib-http-${test} ${test}.cpp)
8084
add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)
81-
target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
85+
sugar_target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
8286
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
83-
target_link_libraries(cpp-netlib-http-${test} rt)
87+
sugar_target_link_libraries(cpp-netlib-http-${test} rt)
8488
endif()
8589
set_target_properties(cpp-netlib-http-${test}
8690
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
87-
add_test(cpp-netlib-http-${test}
91+
sugar_add_gtest(cpp-netlib-http-${test}
8892
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
8993
endforeach (test)
9094

‎libs/network/test/uri/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
# (See accompanying file LICENSE_1_0.txt or copy at
44
# http://www.boost.org/LICENSE_1_0.txt)
55

6+
include(sugar_add_executable)
7+
include(sugar_add_gtest)
8+
include(sugar_target_link_libraries)
9+
610
include_directories(${CPP-NETLIB_SOURCE_DIR})
711

812
if (Boost_FOUND)
@@ -19,16 +23,16 @@ if (Boost_FOUND)
1923
set_source_files_properties(${test}.cpp
2024
PROPERTIES COMPILE_FLAGS "-Wall")
2125
endif()
22-
add_executable(cpp-netlib-${test} ${test}.cpp)
26+
sugar_add_executable(cpp-netlib-${test} ${test}.cpp)
2327
add_dependencies(cpp-netlib-${test} cppnetlib-uri)
24-
target_link_libraries(cpp-netlib-${test}
28+
sugar_target_link_libraries(cpp-netlib-${test}
2529
${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
2630
if (OPENSSL_FOUND)
27-
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
31+
sugar_target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
2832
endif()
2933
set_target_properties(cpp-netlib-${test}
3034
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
31-
add_test(cpp-netlib-${test}
35+
sugar_add_gtest(cpp-netlib-${test}
3236
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
3337
endforeach (test)
3438

0 commit comments

Comments
 (0)