Skip to content

Commit 65b7826

Browse files
deanberrisdeanberris
committed
Fix merge artefacts.
1 parent c044741 commit 65b7826

File tree

1 file changed

+20
-118
lines changed

1 file changed

+20
-118
lines changed

‎http/src/CMakeLists.txt

+20-118
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ set(CPP-NETLIB_HTTP_MESSAGE_SRCS
2424
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
2525
add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
2626
add_dependencies(cppnetlib-http-message
27-
# ${Boost_LIBRARIES}
2827
cppnetlib-message)
2928
target_link_libraries(cppnetlib-http-message
3029
${Boost_LIBRARIES}
@@ -36,73 +35,20 @@ if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
3635
add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
3736
endif()
3837

39-
#set(CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS server_request_parsers_impl.cpp)
40-
#add_library(cppnetlib-http-server-parsers ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
41-
#foreach (src_file ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
42-
#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
43-
# set_source_files_properties(${src_file}
44-
# PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
45-
#elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
46-
# set_source_files_properties(${src_file}
47-
# PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
48-
#endif()
49-
#endforeach(src_file)
50-
#
51-
#set(CPP-NETLIB_HTTP_SERVER_SRCS
52-
# http/server_async_impl.cpp
53-
# http/server_options.cpp
54-
# http/server_socket_options_setter.cpp
55-
# http/server_sync_impl.cpp
56-
# )
57-
#add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
58-
#add_dependencies(cppnetlib-http-server
59-
# ${CPP-NETLIB_LOGGING_LIB}
60-
# cppnetlib-constants
61-
# cppnetlib-uri
62-
# cppnetlib-message
63-
# cppnetlib-message-wrappers
64-
# cppnetlib-message-directives
65-
# cppnetlib-http-message
66-
# cppnetlib-http-message-wrappers
67-
# cppnetlib-http-server-parsers
68-
# cppnetlib-utils-thread_pool
69-
# )
70-
#target_link_libraries(cppnetlib-http-server
71-
# ${Boost_LIBRARIES}
72-
# ${CPP-NETLIB_LOGGING_LIB}
73-
# cppnetlib-constants
74-
# cppnetlib-uri
75-
# cppnetlib-message
76-
# cppnetlib-message-wrappers
77-
# cppnetlib-message-directives
78-
# cppnetlib-http-message
79-
# cppnetlib-http-message-wrappers
80-
# cppnetlib-http-server-parsers
81-
# cppnetlib-utils-thread_pool
82-
# )
83-
#foreach (src_file ${CPP-NETLIB_HTTP_SERVER_SRCS})
84-
#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
85-
# set_source_files_properties(${src_file}
86-
# PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
87-
#elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
88-
# set_source_files_properties(${src_file}
89-
# PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
90-
#endif()
91-
#endforeach(src_file)
92-
9338
set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
94-
<<<<<<< HEAD
95-
http/client_connections.cpp
96-
http/simple_connection_manager.cpp
97-
http/simple_connection_factory.cpp
98-
http/connection_delegate_factory.cpp
99-
http/client_resolver_delegate.cpp
100-
http/client_resolver_delegate_factory.cpp
101-
http/client_connection_delegates.cpp
102-
http/client_connection_factory.cpp
103-
http/client_async_resolver.cpp
104-
http/client_connection_normal.cpp)
105-
add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
39+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connections.cpp
40+
${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_manager.cpp
41+
${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_factory.cpp
42+
${CMAKE_CURRENT_SOURCE_DIR}/http/connection_delegate_factory.cpp
43+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate.cpp
44+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate_factory.cpp
45+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_delegates.cpp
46+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_factory.cpp
47+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_async_resolver.cpp
48+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_normal.cpp)
49+
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
50+
add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
51+
endif()
10652

10753
set(CPP-NETLIB_HTTP_CLIENT_SRCS
10854
http/client.cpp)
@@ -132,36 +78,17 @@ target_link_libraries(cppnetlib-http-client
13278
)
13379

13480
set(CPP-NETLIB_CONSTANTS_SRCS constants.cpp)
135-
add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
81+
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
82+
add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
83+
endif()
13684

13785
# Server implementation files.
13886
set(CPP-NETLIB_HTTP_SERVER_SRCS
139-
http/server/session.cpp http/server/simple_sessions.cpp
140-
http/server/dynamic_dispatcher.cpp)
141-
add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
142-
=======
143-
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connections.cpp
144-
${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_manager.cpp
145-
${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_factory.cpp
146-
${CMAKE_CURRENT_SOURCE_DIR}/http/connection_delegate_factory.cpp
147-
${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate.cpp
148-
${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate_factory.cpp
149-
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_delegates.cpp
150-
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_factory.cpp
151-
${CMAKE_CURRENT_SOURCE_DIR}/http/client_async_resolver.cpp
152-
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_normal.cpp)
153-
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
154-
add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
155-
endif()
156-
foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
157-
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
158-
set_source_files_properties(${src_file}
159-
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
160-
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
161-
set_source_files_properties(${src_file}
162-
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
87+
${CMAKE_CURRENT_SOURCE_DIR}/http/server/session.cpp http/server/simple_sessions.cpp
88+
${CMAKE_CURRENT_SOURCE_DIR}/http/server/dynamic_dispatcher.cpp)
89+
if (NOT CPP-NETLIB_BUILD_SINGLE_LIB)
90+
add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
16391
endif()
164-
endforeach(src_file)
16592

16693
set(CPP-NETLIB_HTTP_CLIENT_SRCS
16794
${CMAKE_CURRENT_SOURCE_DIR}/http/client.cpp)
@@ -191,35 +118,10 @@ if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
191118
cppnetlib-http-client-connections
192119
)
193120
endif()
194-
foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_SRCS})
195-
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
196-
set_source_files_properties(${src_file}
197-
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
198-
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
199-
set_source_files_properties(${src_file}
200-
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
201-
endif()
202-
endforeach(src_file)
203-
204-
set(CPP-NETLIB_CONSTANTS_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/constants.cpp)
205-
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
206-
add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
207-
endif()
208-
foreach (src_file ${CPP-NETLIB_CONSTANTS_SRCS})
209-
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
210-
set_source_files_properties(${src_file}
211-
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
212-
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
213-
set_source_files_properties(${src_file}
214-
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
215-
endif()
216-
endforeach(src_file)
217-
218121

219122
# propagate sources to parent directory for one-lib-build
220123
set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)
221124
set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)
222125
set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)
223126
set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)
224127
set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)
225-
>>>>>>> master

0 commit comments

Comments
 (0)