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

Commitb8c28a5

Browse files
committed
Revert "Fixing booboos."
This reverts commitfb05e2a.
1 parentfb05e2a commitb8c28a5

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed

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

Lines changed: 5 additions & 0 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+
<<<<<<< HEAD
3233
add_dependencies(cpp-netlib-http-${test} cppnetlib-uri-parsers)
3334
target_link_libraries(cpp-netlib-http-${test}${BOOST_LIBS}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
35+
=======
36+
add_dependencies(cpp-netlib-http-${test} cppnetlib-uri)
37+
target_link_libraries(cpp-netlib-http-${test}${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri cppnetlib-client-connections)
38+
>>>>>>> cd5b00337224ee166982f4ce954d2d55b906d7da
3439
if (OPENSSL_FOUND)
3540
target_link_libraries(cpp-netlib-http-${test}${OPENSSL_LIBRARIES})
3641
endif()

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

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@
66
include_directories(${CPP-NETLIB_SOURCE_DIR})
77

88
if (Boost_FOUND)
9-
set(
10-
TESTS
11-
url_test
12-
url_encoding_test
13-
url_builder_test
14-
)
15-
foreach (test${TESTS})
16-
set_source_files_properties(${test}.cpp
17-
PROPERTIESCOMPILE_FLAGS"-Wall")
18-
add_executable(cpp-netlib-${test}${test}.cpp)
19-
add_dependencies(cpp-netlib-${test} cppnetlib-uri)
20-
target_link_libraries(cpp-netlib-${test}${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
21-
if (OPENSSL_FOUND)
22-
target_link_libraries(cpp-netlib-${test}${OPENSSL_LIBRARIES})
23-
endif()
24-
set_target_properties(cpp-netlib-${test}
25-
PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
26-
add_test(cpp-netlib-${test} ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
27-
endforeach (test)
28-
endif(Boost_FOUND)
9+
set(
10+
TESTS
11+
url_test
12+
url_http_test
13+
url_mailto_test
14+
)
15+
foreach (test${TESTS})
16+
set_source_files_properties(${test}.cpp
17+
PROPERTIESCOMPILE_FLAGS"-Wall")
18+
add_executable(cpp-netlib-${test}${test}.cpp)
19+
add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)
20+
target_link_libraries(cpp-netlib-${test}
21+
${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
22+
if (OPENSSL_FOUND)
23+
target_link_libraries(cpp-netlib-${test}${OPENSSL_LIBRARIES})
24+
endif()
25+
set_target_properties(cpp-netlib-${test}
26+
PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
27+
add_test(cpp-netlib-${test}
28+
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
29+
endforeach (test)
30+
endif()

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp