Commitf3d9bdc

committed

Merge pull request#193 from CovenantEyes/0.9-devel

Add needed Boost libs and OpenSSL headers to CMake config

2 parentsd444579 +26c681b commitf3d9bdcCopy full SHA for f3d9bdc

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8)`
`7`	`7`	`project(CPP-NETLIB)`
`8`	`8`	`set(Boost_USE_STATIC_LIBSON)`
`9`	`9`	`set(Boost_USE_MULTI_THREADEDON)`
`10`		`-find_package( Boost 1.45.0 REQUIRED unit_test_frameworksystemregex date_time thread filesystem program_options )`
	`10`	`+find_package( Boost 1.45.0 REQUIRED unit_test_frameworksystemregex date_time thread filesystem program_optionschrono)`
`11`	`11`	`find_package( OpenSSL )`
`12`	`12`	`find_package( Threads )`
`13`	`13`	`set(CMAKE_VERBOSE_MAKEFILEtrue)`
`@@ -18,6 +18,7 @@ endif()`
`18`	`18`
`19`	`19`	`if (OPENSSL_FOUND)`
`20`	`20`	`add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)`
	`21`	`+ include_directories(${OPENSSL_INCLUDE_DIR})`
`21`	`22`	`endif()`
`22`	`23`
`23`	`24`	`if (Boost_FOUND)`
`@@ -37,4 +38,8 @@ if (Boost_FOUND)`
`37`	`38`	`add_subdirectory(libs/network/example)`
`38`	`39`	`endif(Boost_FOUND)`
`39`	`40`
	`41`	`+if (MSVC)`
	`42`	`+ set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} /bigobj")`
	`43`	`+endif()`
	`44`	`+`
`40`	`45`	`enable_testing()`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,17 @@ set(BOOST_CLIENT_LIBS`
`28`	`28`	`${Boost_THREAD_LIBRARY}`
`29`	`29`	`${Boost_DATE_TIME_LIBRARY}`
`30`	`30`	`${Boost_REGEX_LIBRARY}`
`31`		`-${Boost_SYSTEM_LIBRARY})`
	`31`	`+${Boost_SYSTEM_LIBRARY}`
	`32`	`+${Boost_FILESYSTEM_LIBRARY}`
	`33`	`+${Boost_CHRONO_LIBRARY})`
`32`	`34`
`33`	`35`	`set(BOOST_SERVER_LIBS`
`34`	`36`	`${Boost_THREAD_LIBRARY}`
`35`	`37`	`${Boost_SYSTEM_LIBRARY}`
`36`	`38`	`${Boost_DATE_TIME_LIBRARY}`
`37`		`-${Boost_PROGRAM_OPTIONS_LIBRARY})`
	`39`	`+${Boost_PROGRAM_OPTIONS_LIBRARY}`
	`40`	`+${Boost_FILESYSTEM_LIBRARY}`
	`41`	`+${Boost_CHRONO_LIBRARY})`
`38`	`42`
`39`	`43`	`target_link_libraries(http_client`
`40`	`44`	`${BOOST_CLIENT_LIBS}`

Comments

(0)