Skip to content

Fixes failing timeout test. #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 27, 2013
Merged

Fixes failing timeout test. #254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb71d7b
Generate documentation for 0.9.5
deanberris Feb 5, 2013
ebb1795
Updating version.
deanberris Feb 5, 2013
fb1ad5b
Merge branch '0.9-devel' of git://github.com/cpp-netlib/cpp-netlib in…
deanberris Mar 5, 2013
9946eee
Merge branch '0.9-devel' of github.com:cpp-netlib/cpp-netlib into 0.9…
deanberris Jun 26, 2013
8db7bf7
Adding dependency to librt on Linux.
deanberris Jun 26, 2013
68c3caa
Making sure the callback is set before calling it.
deanberris Jun 26, 2013
2bbc404
Up version to 0.10.0
deanberris Jun 26, 2013
b86879e
Generating documentation for 0.10.0
deanberris Jun 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adding dependency to librt on Linux.
  • Loading branch information
@deanberris
deanberris committed Jun 26, 2013
commit 8db7bf727765c8997933251346c3b836ceae32c7
13 changes: 12 additions & 1 deletion libs/network/example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,23 @@ if (OPENSSL_FOUND)
target_link_libraries(hello_world_client ${OPENSSL_LIBRARIES})
endif (OPENSSL_FOUND)

if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(http_client rt)
target_link_libraries(simple_wget rt)
target_link_libraries(atom_reader rt)
target_link_libraries(rss_reader rt)
target_link_libraries(twitter_search rt)
target_link_libraries(hello_world_server rt)
target_link_libraries(hello_world_client rt)
endif()

if (UNIX)
target_link_libraries(fileserver
${BOOST_SERVER_LIBS}
${Boost_FILESYSTEM_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
cppnetlib-server-parsers)
cppnetlib-server-parsers
rt)
endif (UNIX)

set_target_properties(http_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
Expand Down
3 changes: 3 additions & 0 deletions libs/network/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ if (Boost_FOUND)
if (OPENSSL_FOUND)
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(cpp-netlib-${test} rt)
endif()
set_target_properties(cpp-netlib-${test}
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
add_test(cpp-netlib-${test}
Expand Down
6 changes: 6 additions & 0 deletions libs/network/test/http/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ if (Boost_FOUND)
if (OPENSSL_FOUND)
target_link_libraries(cpp-netlib-http-${test} ${OPENSSL_LIBRARIES})
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(cpp-netlib-http-${test} rt)
endif()
set_target_properties(cpp-netlib-http-${test}
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
add_test(cpp-netlib-http-${test}
Expand All @@ -53,6 +56,9 @@ if (Boost_FOUND)
add_executable(cpp-netlib-http-${test} ${test}.cpp)
add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)
target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(cpp-netlib-http-${test} rt)
endif()
set_target_properties(cpp-netlib-http-${test}
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
add_test(cpp-netlib-http-${test}
Expand Down