NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commit43eca38

committed

Make CMake configs work on OS X.

1 parent2b33021 commit43eca38Copy full SHA for 43eca38

File tree

2 files changed

+10

-5

lines changed

CMakeLists.txt
libs/network/src
- CMakeLists.txt

2 files changed

+10

-5

lines changed

`‎CMakeLists.txt‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ else()`
`37`	`37`	`endif()`
`38`	`38`
`39`	`39`	`set(Boost_USE_MULTI_THREADEDON)`
`40`		`-find_package( Boost 1.54.0 REQUIRED unit_test_frameworksystemregex date_time thread filesystem program_options chrono )`
	`40`	`+find_package( Boost 1.54.0`
	`41`	`+ REQUIRED unit_test_frameworksystemregex date_time thread filesystem`
	`42`	`+ program_options chrono atomic )`
`41`	`43`	`find_package( OpenSSL )`
`42`	`44`	`find_package( Threads )`
`43`	`45`	`set(CMAKE_VERBOSE_MAKEFILEtrue)`

`‎libs/network/src/CMakeLists.txt‎`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ set_target_properties(cppnetlib-uri`
`20`	`20`	`install(TARGETS cppnetlib-uri`
`21`	`21`	`EXPORT cppnetlibTargets`
`22`	`22`	`PUBLIC_HEADERDESTINATION${CMAKE_INSTALL_FULL_INCLUDEDIR}`
`23`		`- LIBRARYDESTINATION${CMAKE_INSTALL_FULL_LIBDIR})`
	`23`	`+ LIBRARYDESTINATION${CMAKE_INSTALL_FULL_LIBDIR}`
	`24`	`+ ARCHIVEDESTINATION${CMAKE_INSTALL_FULL_LIBDIR})`
`24`	`25`
`25`	`26`	`set(CPP-NETLIB_HTTP_SERVER_SRCS server_request_parsers_impl.cpp)`
`26`	`27`	`add_library(cppnetlib-server-parsers ${CPP-NETLIB_HTTP_SERVER_SRCS})`
`@@ -31,7 +32,8 @@ set_target_properties(cppnetlib-server-parsers`
`31`	`32`	`install(TARGETS cppnetlib-server-parsers`
`32`	`33`	`EXPORT cppnetlibTargets`
`33`	`34`	`PUBLIC_HEADERDESTINATION${CMAKE_INSTALL_FULL_INCLUDEDIR}`
`34`		`- LIBRARYDESTINATION${CMAKE_INSTALL_FULL_LIBDIR})`
	`35`	`+ LIBRARYDESTINATION${CMAKE_INSTALL_FULL_LIBDIR}`
	`36`	`+ ARCHIVEDESTINATION${CMAKE_INSTALL_FULL_LIBDIR})`
`35`	`37`
`36`	`38`	`set(CPP-NETLIB_HTTP_CLIENT_SRCS client.cpp)`
`37`	`39`	`add_library(cppnetlib-client-connections ${CPP-NETLIB_HTTP_CLIENT_SRCS})`
`@@ -43,9 +45,10 @@ if (OPENSSL_FOUND)`
`43`	`45`	`target_link_libraries(cppnetlib-client-connections ssl crypto)`
`44`	`46`	`endif ()`
`45`	`47`	`if (Boost_FOUND)`
`46`		`- target_link_libraries(cppnetlib-client-connectionsboost_system)`
	`48`	`+ target_link_libraries(cppnetlib-client-connections${Boost_System_LIBRARY})`
`47`	`49`	`endif ()`
`48`	`50`	`install(TARGETS cppnetlib-client-connections`
`49`	`51`	`EXPORT cppnetlibTargets`
`50`	`52`	`PUBLIC_HEADERDESTINATION${CMAKE_INSTALL_FULL_INCLUDEDIR}`
`51`		`- LIBRARYDESTINATION${CMAKE_INSTALL_FULL_LIBDIR})`
	`53`	`+ LIBRARYDESTINATION${CMAKE_INSTALL_FULL_LIBDIR}`
	`54`	`+ ARCHIVEDESTINATION${CMAKE_INSTALL_FULL_LIBDIR})`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit43eca38

File tree

2 files changed

2 files changed

`‎CMakeLists.txt‎`

`‎libs/network/src/CMakeLists.txt‎`

0 commit comments