Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit9d03a03

Browse files
committed
Merge pull request#179 from glynos/restructure_dirs
Restructure dirs
2 parentse10bdf1 +33176c3 commit9d03a03

File tree

93 files changed

+347
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+347
-305
lines changed

‎CMakeLists.txt‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ if (Boost_FOUND)
8686
enable_testing()
8787
add_subdirectory(libs/network/test)
8888
if (NOTMSVC)
89-
add_subdirectory(libs/mime/test)
89+
#add_subdirectory(libs/mime/test)
9090
endif(NOTMSVC)
9191
endif()
9292
if(CPP-NETLIB_BUILD_EXAMPLES)
93-
add_subdirectory(libs/network/example)
93+
#add_subdirectory(libs/network/example)
9494
endif()
9595
endif(Boost_FOUND)
9696

@@ -104,3 +104,12 @@ message(STATUS " CPP-NETLIB_BUILD_TESTS: ${CPP-NETLIB_BUILD_TESTS}\t(Buil
104104
message(STATUS" CPP-NETLIB_BUILD_EXAMPLES: ${CPP-NETLIB_BUILD_EXAMPLES}\t(Build the examples using cpp-netlib: ON, OFF)")
105105
message(STATUS" CPP-NETLIB_ALWAYS_LOGGING: ${CPP-NETLIB_ALWAYS_LOGGING}\t(Allow cpp-netlib to log debug messages even in non-debug mode: ON, OFF)")
106106
message(STATUS" CPP-NETLIB_DISABLE_LOGGING: ${CPP-NETLIB_DISABLE_LOGGING}\t(Disable logging definitely, no logging code will be generated or compiled: ON, OFF)")
107+
108+
############################################################################
109+
#
110+
# The code following this point is for the new directory structure
111+
#
112+
113+
add_subdirectory(uri)
114+
add_subdirectory(message)
115+
add_subdirectory(logging)

‎libs/network/src/CMakeLists.txt‎

Lines changed: 60 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@
77
# http://www.boost.org/LICENSE_1_0.txt)
88

99

10-
include_directories(${CPP-NETLIB_SOURCE_DIR}/include)
11-
include_directories(${CPP-NETLIB_SOURCE_DIR})
10+
include_directories(
11+
${CPP-NETLIB_SOURCE_DIR}/uri/src
12+
${CPP-NETLIB_SOURCE_DIR}/message/src
13+
${CPP-NETLIB_SOURCE_DIR}/logging/src
14+
${CPP-NETLIB_SOURCE_DIR}/include
15+
${CPP-NETLIB_SOURCE_DIR})
16+
1217
if (OPENSSL_FOUND)
1318
include_directories(${OPENSSL_INCLUDE_DIR})
1419
endif()
@@ -25,78 +30,6 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
2530
set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11 -stdlib=libc++")
2631
endif()
2732

28-
if( CPP-NETLIB_ALWAYS_LOGGING )
29-
add_definitions( /D NETWORK_ENABLE_LOGGING )
30-
endif()
31-
32-
if(NOT CPP-NETLIB_DISABLE_LOGGING )
33-
set( CPP-NETLIB_LOGGING_SRCS
34-
logging/logging.cpp
35-
)
36-
add_library(cppnetlib-logging ${CPP-NETLIB_LOGGING_SRCS})
37-
foreach (src_file ${CPP-NETLIB_LOGGING_SRCS})
38-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
39-
set_source_files_properties(${src_file}
40-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
41-
endif()
42-
endforeach(src_file)
43-
44-
# this library name is defined only if we created the target
45-
# if not then it will be empty
46-
set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
47-
48-
endif()
49-
50-
set(CPP-NETLIB_URI_SRCS uri/uri.cpp uri/schemes.cpp uri/normalize.cpp)
51-
add_library(cppnetlib-uri ${CPP-NETLIB_URI_SRCS})
52-
foreach (src_file ${CPP-NETLIB_URI_SRCS})
53-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
54-
set_source_files_properties(${src_file}
55-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
56-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)
57-
set_source_files_properties(${src_file}
58-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
59-
endif()
60-
endforeach(src_file)
61-
62-
set(CPP-NETLIB_MESSAGE_SRCS message/message.cpp)
63-
add_library(cppnetlib-message ${CPP-NETLIB_MESSAGE_SRCS})
64-
add_dependencies(cppnetlib-message cppnetlib-uri)
65-
target_link_libraries(cppnetlib-message cppnetlib-uri)
66-
foreach (src_file ${CPP-NETLIB_MESSAGE_SRCS})
67-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
68-
set_source_files_properties(${src_file}
69-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
70-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)
71-
set_source_files_properties(${src_file}
72-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
73-
endif()
74-
endforeach(src_file)
75-
76-
set(CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS message/directives.cpp)
77-
add_library(cppnetlib-message-directives ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
78-
foreach (src_file ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
79-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
80-
set_source_files_properties(${src_file}
81-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
82-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)
83-
set_source_files_properties(${src_file}
84-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
85-
endif()
86-
endforeach(src_file)
87-
88-
set(CPP-NETLIB_MESSAGE_WRAPPERS_SRCS message/wrappers.cpp)
89-
add_library(cppnetlib-message-wrappers ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
90-
foreach (src_file ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
91-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
92-
set_source_files_properties(${src_file}
93-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
94-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)
95-
set_source_files_properties(${src_file}
96-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
97-
endif()
98-
endforeach(src_file)
99-
10033
set(CPP-NETLIB_HTTP_MESSAGE_SRCS http/request.cpp http/response.cpp)
10134
add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
10235
add_dependencies(cppnetlib-http-message
@@ -127,59 +60,59 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
12760
endif()
12861
endforeach(src_file)
12962

130-
set(CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS server_request_parsers_impl.cpp)
131-
add_library(cppnetlib-http-server-parsers ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
132-
foreach (src_file ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
133-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
134-
set_source_files_properties(${src_file}
135-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
136-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)
137-
set_source_files_properties(${src_file}
138-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
139-
endif()
140-
endforeach(src_file)
141-
142-
set(CPP-NETLIB_HTTP_SERVER_SRCS
143-
http/server_async_impl.cpp
144-
http/server_options.cpp
145-
http/server_socket_options_setter.cpp
146-
http/server_sync_impl.cpp
147-
)
148-
add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
149-
add_dependencies(cppnetlib-http-server
150-
${CPP-NETLIB_LOGGING_LIB}
151-
cppnetlib-constants
152-
cppnetlib-uri
153-
cppnetlib-message
154-
cppnetlib-message-wrappers
155-
cppnetlib-message-directives
156-
cppnetlib-http-message
157-
cppnetlib-http-message-wrappers
158-
cppnetlib-http-server-parsers
159-
cppnetlib-utils-thread_pool
160-
)
161-
target_link_libraries(cppnetlib-http-server
162-
${Boost_LIBRARIES}
163-
${CPP-NETLIB_LOGGING_LIB}
164-
cppnetlib-constants
165-
cppnetlib-uri
166-
cppnetlib-message
167-
cppnetlib-message-wrappers
168-
cppnetlib-message-directives
169-
cppnetlib-http-message
170-
cppnetlib-http-message-wrappers
171-
cppnetlib-http-server-parsers
172-
cppnetlib-utils-thread_pool
173-
)
174-
foreach (src_file ${CPP-NETLIB_HTTP_SERVER_SRCS})
175-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
176-
set_source_files_properties(${src_file}
177-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
178-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)
179-
set_source_files_properties(${src_file}
180-
PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
181-
endif()
182-
endforeach(src_file)
63+
#set(CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS server_request_parsers_impl.cpp)
64+
#add_library(cppnetlib-http-server-parsers ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
65+
#foreach (src_file ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
66+
#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
67+
# set_source_files_properties(${src_file}
68+
# PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
69+
#elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
70+
# set_source_files_properties(${src_file}
71+
# PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
72+
#endif()
73+
#endforeach(src_file)
74+
#
75+
#set(CPP-NETLIB_HTTP_SERVER_SRCS
76+
# http/server_async_impl.cpp
77+
# http/server_options.cpp
78+
# http/server_socket_options_setter.cpp
79+
# http/server_sync_impl.cpp
80+
# )
81+
#add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
82+
#add_dependencies(cppnetlib-http-server
83+
# ${CPP-NETLIB_LOGGING_LIB}
84+
# cppnetlib-constants
85+
# cppnetlib-uri
86+
# cppnetlib-message
87+
# cppnetlib-message-wrappers
88+
# cppnetlib-message-directives
89+
# cppnetlib-http-message
90+
# cppnetlib-http-message-wrappers
91+
# cppnetlib-http-server-parsers
92+
# cppnetlib-utils-thread_pool
93+
# )
94+
#target_link_libraries(cppnetlib-http-server
95+
# ${Boost_LIBRARIES}
96+
# ${CPP-NETLIB_LOGGING_LIB}
97+
# cppnetlib-constants
98+
# cppnetlib-uri
99+
# cppnetlib-message
100+
# cppnetlib-message-wrappers
101+
# cppnetlib-message-directives
102+
# cppnetlib-http-message
103+
# cppnetlib-http-message-wrappers
104+
# cppnetlib-http-server-parsers
105+
# cppnetlib-utils-thread_pool
106+
# )
107+
#foreach (src_file ${CPP-NETLIB_HTTP_SERVER_SRCS})
108+
#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
109+
# set_source_files_properties(${src_file}
110+
# PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
111+
#elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
112+
# set_source_files_properties(${src_file}
113+
# PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
114+
#endif()
115+
#endforeach(src_file)
183116

184117
set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
185118
http/client_connections.cpp

‎libs/network/test/CMakeLists.txt‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,9 @@ if(CPP-NETLIB_BUILD_SHARED_LIBS)
99
add_definitions(-DCPP-NETLIB_BUILD_SHARED_LIBS)
1010
endif()
1111

12-
add_subdirectory(logging)
13-
add_subdirectory(uri)
1412
add_subdirectory(http)
1513

1614
if (Boost_FOUND)
17-
set(
18-
TESTS
19-
message_test
20-
message_transform_test
21-
)
22-
foreach (test${TESTS})
23-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
24-
set_source_files_properties(${test}.cpp
25-
PROPERTIESCOMPILE_FLAGS"-Wall")
26-
endif()
27-
add_executable(cpp-netlib-${test}${test}.cpp)
28-
add_dependencies(cpp-netlib-${test}
29-
cppnetlib-uri
30-
cppnetlib-message
31-
cppnetlib-message-directives
32-
cppnetlib-message-wrappers)
33-
34-
target_link_libraries(cpp-netlib-${test}
35-
${Boost_LIBRARIES}
36-
${CMAKE_THREAD_LIBS_INIT}
37-
cppnetlib-uri
38-
cppnetlib-message
39-
cppnetlib-message-directives
40-
cppnetlib-message-wrappers)
41-
if (OPENSSL_FOUND)
42-
include_directories(${OPENSSL_INCLUDE_DIR})
43-
target_link_libraries(cpp-netlib-${test}${OPENSSL_LIBRARIES})
44-
endif()
45-
set_target_properties(cpp-netlib-${test}
46-
PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
47-
add_test(cpp-netlib-${test}
48-
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
49-
endforeach (test)
5015

5116
set_source_files_properties(utils_thread_pool.cpp
5217
PROPERTIESCOMPILE_FLAGS"-Wall")

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

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

7-
include_directories(${CPP-NETLIB_SOURCE_DIR}/include)
8-
include_directories(${CPP-NETLIB_SOURCE_DIR})
7+
include_directories(
8+
${CPP-NETLIB_SOURCE_DIR}/uri/src
9+
${CPP-NETLIB_SOURCE_DIR}/message/src
10+
${CPP-NETLIB_SOURCE_DIR}/logging/src
11+
${CPP-NETLIB_SOURCE_DIR}/include
12+
${CPP-NETLIB_SOURCE_DIR})
913

1014
if (OPENSSL_FOUND)
1115
include_directories(${OPENSSL_INCLUDE_DIR} )
1216
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
1317
endif()
1418

19+
if(NOT CPP-NETLIB_DISABLE_LOGGING )
20+
set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
21+
endif()
22+
23+
# this library name is defined only if we created the target
24+
# if not then it will be empty
25+
set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
26+
1527
if (Boost_FOUND)
1628
# These are the internal (simple) tests.
1729
set ( MESSAGE_TESTS
@@ -73,6 +85,7 @@ if (Boost_FOUND)
7385
cppnetlib-message
7486
cppnetlib-message-wrappers
7587
cppnetlib-message-directives
88+
${CPP-NETLIB_LOGGING_LIB}
7689
cppnetlib-http-message
7790
cppnetlib-http-message-wrappers
7891
cppnetlib-http-client
@@ -86,33 +99,33 @@ if (Boost_FOUND)
8699
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
87100
endforeach (test)
88101

89-
set ( SERVER_API_TESTS
90-
server_constructor_test
91-
server_async_run_stop_concurrency
92-
)
93-
foreach (test${SERVER_API_TESTS} )
94-
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)
95-
set_source_files_properties(${test}.cpp
96-
PROPERTIESCOMPILE_FLAGS"-Wall")
97-
endif()
98-
add_executable(cpp-netlib-http-${test}${test}.cpp)
99-
target_link_libraries(cpp-netlib-http-${test}
100-
${Boost_LIBRARIES}
101-
${ICU_LIBRARIES}${ICU_I18N_LIBRARIES}
102-
${CMAKE_THREAD_LIBS_INIT}
103-
cppnetlib-constants
104-
cppnetlib-uri
105-
cppnetlib-message
106-
cppnetlib-message-wrappers
107-
cppnetlib-http-message
108-
cppnetlib-http-server
109-
cppnetlib-http-server-parsers
110-
cppnetlib-utils-thread_pool
111-
)
112-
set_target_properties(cpp-netlib-http-${test}
113-
PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
114-
add_test(cpp-netlib-http-${test}
115-
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
116-
endforeach (test)
102+
#set ( SERVER_API_TESTS
103+
# server_constructor_test
104+
# server_async_run_stop_concurrency
105+
# )
106+
#foreach ( test ${SERVER_API_TESTS} )
107+
# if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
108+
# set_source_files_properties(${test}.cpp
109+
# PROPERTIES COMPILE_FLAGS "-Wall")
110+
# endif()
111+
# add_executable(cpp-netlib-http-${test} ${test}.cpp)
112+
# target_link_libraries(cpp-netlib-http-${test}
113+
# ${Boost_LIBRARIES}
114+
# ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}
115+
# ${CMAKE_THREAD_LIBS_INIT}
116+
# cppnetlib-constants
117+
# cppnetlib-uri
118+
# cppnetlib-message
119+
# cppnetlib-message-wrappers
120+
# cppnetlib-http-message
121+
# cppnetlib-http-server
122+
# cppnetlib-http-server-parsers
123+
# cppnetlib-utils-thread_pool
124+
# )
125+
# set_target_properties(cpp-netlib-http-${test}
126+
# PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
127+
# add_test(cpp-netlib-http-${test}
128+
# ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
129+
#endforeach (test)
117130

118131
endif()

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp