Commita4dabd5

committed

Applied some fixes to the build scripts (cpp-netlib#131)

1 parent39d7630 commita4dabd5Copy full SHA for a4dabd5

File tree

+15

-9

lines changed

+15

-9

lines changed

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,21 +20,23 @@ add_executable(hello_world_client http/hello_world_client.cpp)`
`20`	`20`	`# add_executable(fileserver http/fileserver.cpp)`
`21`	`21`	`#endif (UNIX)`
`22`	`22`	`set(BOOST_CLIENT_LIBS`
`23`		`-${Boost_PROGRAM_OPTIONS_LIBRARY}`
`24`		`-${Boost_THREAD_LIBRARY}`
`25`	`23`	`${Boost_CHRONO_LIBRARY}`
`26`	`24`	`${Boost_DATE_TIME_LIBRARY}`
`27`		`-${Boost_REGEX_LIBRARY}`
	`25`	`+${Boost_SYSTEM_LIBRARY}`
`28`	`26`	`${Boost_FILESYSTEM_LIBRARY}`
`29`		`-${Boost_SYSTEM_LIBRARY})`
`30`		`-`
`31`		`-set(BOOST_SERVER_LIBS`
	`27`	`+${Boost_PROGRAM_OPTIONS_LIBRARY}`
	`28`	`+${Boost_REGEX_LIBRARY}`
`32`	`29`	`${Boost_THREAD_LIBRARY}`
	`30`	`+)`
	`31`	`+set(BOOST_SERVER_LIBS`
`33`	`32`	`${Boost_CHRONO_LIBRARY}`
`34`		`-${Boost_SYSTEM_LIBRARY}`
`35`	`33`	`${Boost_DATE_TIME_LIBRARY}`
`36`		`-${Boost_PROGRAM_OPTIONS_LIBRARY})`
`37`		`-`
	`34`	`+${Boost_SYSTEM_LIBRARY}`
	`35`	`+${Boost_FILESYSTEM_LIBRARY}`
	`36`	`+${Boost_PROGRAM_OPTIONS_LIBRARY}`
	`37`	`+${Boost_THREAD_LIBRARY}`
	`38`	`+)`
	`39`	`+`
`38`	`40`	`target_link_libraries(uri_builder`
`39`	`41`	`${BOOST_CLIENT_LIBS}`
`40`	`42`	`${CMAKE_THREAD_LIBS_INIT}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`
`9`	`9`	`include_directories(${CPP-NETLIB_SOURCE_DIR}/include)`
`10`	`10`	`include_directories(${CPP-NETLIB_SOURCE_DIR})`
	`11`	`+if (OPENSSL_FOUND)`
	`12`	`+include_directories(${OPENSSL_INCLUDE_DIR})`
	`13`	`+endif()`
`11`	`14`
`12`	`15`	`if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)`
`13`	`16`	`if (HAVE_STD11)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ if (Boost_FOUND)`
`34`	`34`	`cppnetlib-message-directives`
`35`	`35`	`cppnetlib-message-wrappers)`
`36`	`36`	`if (OPENSSL_FOUND)`
	`37`	`+include_directories(${OPENSSL_INCLUDE_DIR})`
`37`	`38`	`target_link_libraries(cpp-netlib-${test}${OPENSSL_LIBRARIES})`
`38`	`39`	`endif()`
`39`	`40`	`set_target_properties(cpp-netlib-${test}`

Comments

(0)