Skip to content

Commit e4e0c1a

Browse files
deanberrisdeanberris
committed
Merge pull request cpp-netlib#355 from metherealone/0.11-devel
added ws2_32 and wsock32 target libraries to cmake files that is require...
2 parents 68482ed + 7c92ba2 commit e4e0c1a

File tree

5 files changed

+49
-19
lines changed

5 files changed

+49
-19
lines changed

‎libs/mime/test/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
include_directories(${CPP-NETLIB_SOURCE_DIR})
22
file ( COPY TestMessages DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
33

4-
if ( Boost_FOUND )
4+
#This test causes a "too many sections" error on Windows MinGW64
5+
#(MSVC has /bigobj, MinGW does not)
6+
if (NOT(${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES "Windows"))
7+
if ( Boost_FOUND )
58
add_executable ( mime-roundtrip mime-roundtrip.cpp )
69
target_link_libraries ( mime-roundtrip ${Boost_LIBRARIES}
710
${CMAKE_THREAD_LIBS_INIT})
8-
add_test ( mime-roundtrip mime-roundtrip )
9-
endif ()
11+
add_test ( mime-roundtrip ${CPP-NETLIB_BINARY_DIR}/tests/mime-roundtrip )
12+
endif ()
13+
endif()
1014

‎libs/network/example/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@ if (OPENSSL_FOUND)
9999
target_link_libraries(hello_world_async_server_with_work_queue ${OPENSSL_LIBRARIES})
100100
endif (OPENSSL_FOUND)
101101

102+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
103+
target_link_libraries(http_client ws2_32)
104+
target_link_libraries(simple_wget ws2_32)
105+
target_link_libraries(atom_reader ws2_32)
106+
target_link_libraries(rss_reader ws2_32)
107+
target_link_libraries(twitter_search ws2_32)
108+
target_link_libraries(hello_world_server ws2_32 wsock32)
109+
target_link_libraries(hello_world_client ws2_32)
110+
target_link_libraries(hello_world_async_server_with_work_queue ws2_32 wsock32)
111+
endif()
112+
102113
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
103114
target_link_libraries(http_client rt)
104115
target_link_libraries(simple_wget rt)

‎libs/network/test/CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,17 @@ if (Boost_FOUND)
2222
PROPERTIES COMPILE_FLAGS "-Wall")
2323
endif()
2424
add_executable(cpp-netlib-${test} ${test}.cpp)
25-
add_dependencies(cpp-netlib-${test} cppnetlib-uri)
25+
add_dependencies(cpp-netlib-${test} cppnetlib-uri)
2626
target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
2727
if (OPENSSL_FOUND)
28-
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
28+
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
2929
endif()
30-
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
31-
target_link_libraries(cpp-netlib-${test} rt)
32-
endif()
30+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
31+
target_link_libraries(cpp-netlib-${test} ws2_32 wsock32)
32+
endif()
33+
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
34+
target_link_libraries(cpp-netlib-${test} rt)
35+
endif()
3336
set_target_properties(cpp-netlib-${test}
3437
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
3538
add_test(cpp-netlib-${test}

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

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif()
1414
if (Boost_FOUND)
1515
set ( TESTS
1616
request_incremental_parser_test
17-
request_linearize_test
17+
request_linearize_test
1818
)
1919
foreach ( test ${TESTS} )
2020
add_executable(cpp-netlib-http-${test} ${test}.cpp)
@@ -23,9 +23,12 @@ if (Boost_FOUND)
2323
target_link_libraries(cpp-netlib-http-${test}
2424
${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
2525
cppnetlib-uri)
26-
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
27-
target_link_libraries(cpp-netlib-http-${test} rt)
28-
endif()
26+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
27+
target_link_libraries(cpp-netlib-http-${test} ws2_32)
28+
endif()
29+
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
30+
target_link_libraries(cpp-netlib-http-${test} rt)
31+
endif()
2932
set_target_properties(cpp-netlib-http-${test}
3033
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
3134
add_test(cpp-netlib-http-${test}
@@ -50,9 +53,12 @@ if (Boost_FOUND)
5053
if (OPENSSL_FOUND)
5154
target_link_libraries(cpp-netlib-http-${test} ${OPENSSL_LIBRARIES})
5255
endif()
53-
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
54-
target_link_libraries(cpp-netlib-http-${test} rt)
55-
endif()
56+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
57+
target_link_libraries(cpp-netlib-http-${test} ws2_32)
58+
endif()
59+
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
60+
target_link_libraries(cpp-netlib-http-${test} rt)
61+
endif()
5662
set_target_properties(cpp-netlib-http-${test}
5763
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
5864
add_test(cpp-netlib-http-${test}
@@ -68,9 +74,12 @@ if (Boost_FOUND)
6874
add_executable(cpp-netlib-http-${test} ${test}.cpp)
6975
add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)
7076
target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
71-
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
72-
target_link_libraries(cpp-netlib-http-${test} rt)
73-
endif()
77+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
78+
target_link_libraries(cpp-netlib-http-${test} ws2_32 wsock32)
79+
endif()
80+
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
81+
target_link_libraries(cpp-netlib-http-${test} rt)
82+
endif()
7483
set_target_properties(cpp-netlib-http-${test}
7584
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
7685
add_test(cpp-netlib-http-${test}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ if (Boost_FOUND)
2424
target_link_libraries(cpp-netlib-${test}
2525
${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
2626
if (OPENSSL_FOUND)
27-
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
27+
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
2828
endif()
29+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
30+
target_link_libraries(cpp-netlib-${test} ws2_32)
31+
endif()
2932
set_target_properties(cpp-netlib-${test}
3033
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
3134
add_test(cpp-netlib-${test}

0 commit comments

Comments
 (0)