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

Commit7e21d0f

Browse files
committed
Final tweaks to get things going again.
1 parente92fe04 commit7e21d0f

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
1616
add_definitions(-DBOOST_NETWORK_DEBUG)
1717
endif()
1818

19-
if (OpenSSL_FOUND)
19+
if (OPENSSL_FOUND)
2020
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
2121
endif()
2222

‎libs/network/example/CMakeLists.txt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@
66
include_directories(${CPP-NETLIB_SOURCE_DIR})
77
include_directories(${OPENSSL_INCLUDE_DIR})
88

9-
if (OPENSSL_FOUND)
10-
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
11-
endif()
12-
139
add_executable(http_client http_client.cpp)
1410
add_executable(simple_wget simple_wget.cpp)
1511
add_executable(hello_world_server http/hello_world_server.cpp)
1612
add_executable(fileserver http/fileserver.cpp)
1713
add_executable(uri uri.cpp)
18-
add_dependencies(http_client cppnetlib-uri-parsers)
19-
add_dependencies(simple_wget cppnetlib-uri-parsers)
14+
add_dependencies(http_client cppnetlib-uri-parsers cppnetlib-client-connections)
15+
add_dependencies(simple_wget cppnetlib-uri-parsers cppnetlib-client-connections)
2016
add_dependencies(uri cppnetlib-uri-parsers)
2117
set(BOOST_CLIENT_LIBS
2218
${Boost_PROGRAM_OPTIONS_LIBRARY}
@@ -32,13 +28,15 @@ target_link_libraries(http_client
3228
${BOOST_CLIENT_LIBS}
3329
${CMAKE_THREAD_LIBS_INIT}
3430
${OPENSSL_LIBRARIES}
35-
cppnetlib-uri-parsers)
31+
cppnetlib-uri-parsers
32+
cppnetlib-client-connections)
3633

3734
target_link_libraries(simple_wget
3835
${BOOST_CLIENT_LIBS}
3936
${CMAKE_THREAD_LIBS_INIT}
4037
${OPENSSL_LIBRARIES}
41-
cppnetlib-uri-parsers)
38+
cppnetlib-uri-parsers
39+
cppnetlib-client-connections)
4240

4341
target_link_libraries(hello_world_server
4442
${BOOST_SERVER_LIBS}

‎libs/network/src/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
include_directories(${CPP-NETLIB_SOURCE_DIR})
1010

11-
if (OPENSSL_FOUND)
12-
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
13-
endif()
14-
1511
set(CPP-NETLIB_URI_SRCS uri/parse.cpp)
1612
add_library(cppnetlib-uri-parsers ${CPP-NETLIB_URI_SRCS})
1713

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,13 @@ if (Boost_FOUND)
2929
PROPERTIESCOMPILE_FLAGS"-Wall")
3030
endif()
3131
add_executable(cpp-netlib-http-${test}${test}.cpp)
32-
add_dependencies(cpp-netlib-http-${test} cppnetlib-uri-parsers)
33-
target_link_libraries(cpp-netlib-http-${test}${BOOST_LIBS}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
32+
add_dependencies(cpp-netlib-http-${test}
33+
cppnetlib-uri-parsers
34+
cppnetlib-client-connections)
35+
target_link_libraries(cpp-netlib-http-${test}
36+
${BOOST_LIBS}${CMAKE_THREAD_LIBS_INIT}
37+
cppnetlib-uri-parsers
38+
cppnetlib-client-connections)
3439
if (OPENSSL_FOUND)
3540
target_link_libraries(cpp-netlib-http-${test}${OPENSSL_LIBRARIES})
3641
endif()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp