Commit33176c3

committed

Adjustments to build scripts in order to compile on MSVC 2012.

1 parentdcbb386 commit33176c3Copy full SHA for 33176c3

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,14 @@ if (OPENSSL_FOUND)`
`16`	`16`	`add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)`
`17`	`17`	`endif()`
`18`	`18`
	`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`	`+`
`19`	`27`	`if (Boost_FOUND)`
`20`	`28`	`# These are the internal (simple) tests.`
`21`	`29`	`set ( MESSAGE_TESTS`
`@@ -77,6 +85,7 @@ if (Boost_FOUND)`
`77`	`85`	`cppnetlib-message`
`78`	`86`	`cppnetlib-message-wrappers`
`79`	`87`	`cppnetlib-message-directives`
	`88`	`+ ${CPP-NETLIB_LOGGING_LIB}`
`80`	`89`	`cppnetlib-http-message`
`81`	`90`	`cppnetlib-http-message-wrappers`
`82`	`91`	`cppnetlib-http-client`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ if (Boost_FOUND)`
`22`	`22`	`add_executable(cpp-netlib-${test}${test}.cpp)`
`23`	`23`	`add_dependencies(cpp-netlib-${test} cppnetlib-uri)`
`24`	`24`	`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)`
`26`	`26`	`if (OPENSSL_FOUND)`
`27`	`27`	`target_link_libraries(cpp-netlib-${test}${OPENSSL_LIBRARIES})`
`28`	`28`	`endif()`

Comments

(0)