Skip to content

Commit 33176c3

Browse files
committed
Adjustments to build scripts in order to compile on MSVC 2012.
1 parent dcbb386 commit 33176c3

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

libs/network/test/http/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ if (OPENSSL_FOUND)
1616
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
1717
endif()
1818

19+
if( NOT CPP-NETLIB_DISABLE_LOGGING )
20+
set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
21+
endif()
22+
23+
# this library name is defined only if we created the target
24+
# if not then it will be empty
25+
set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
26+
1927
if (Boost_FOUND)
2028
# These are the internal (simple) tests.
2129
set ( MESSAGE_TESTS
@@ -77,6 +85,7 @@ if (Boost_FOUND)
7785
cppnetlib-message
7886
cppnetlib-message-wrappers
7987
cppnetlib-message-directives
88+
${CPP-NETLIB_LOGGING_LIB}
8089
cppnetlib-http-message
8190
cppnetlib-http-message-wrappers
8291
cppnetlib-http-client

uri/test/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if (Boost_FOUND)
2222
add_executable(cpp-netlib-${test} ${test}.cpp)
2323
add_dependencies(cpp-netlib-${test} cppnetlib-uri)
2424
target_link_libraries(cpp-netlib-${test}
25-
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
25+
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
2626
if (OPENSSL_FOUND)
2727
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
2828
endif()

0 commit comments

Comments
 (0)