Commit090e18b

authored

Merge pull request#694 from anonimal/cherry-pick-acb020b

OSX: update OpenSSL detection.Closes#690

2 parents48e315d +fb6a375 commit090e18bCopy full SHA for 090e18b

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,23 @@ set(Boost_USE_MULTI_THREADED ON)`
`48`	`48`	`find_package(Boost 1.58.0 REQUIRED COMPONENTSsystem)`
`49`	`49`
`50`	`50`	`if (CPP-NETLIB_ENABLE_HTTPS)`
`51`		`- find_package( OpenSSL )`
	`51`	`+ if (APPLE)`
	`52`	`+# If we're on OSX check for Homebrew's copy of OpenSSL instead of Apple's`
	`53`	`+ if (NOT OpenSSL_DIR)`
	`54`	`+ find_program(HOMEBREW brew)`
	`55`	`+ if (HOMEBREWSTREQUAL"HOMEBREW-NOTFOUND")`
	`56`	`+ message(WARNING"Homebrew not found: not using Homebrew's OpenSSL")`
	`57`	`+ if (NOT OPENSSL_ROOT_DIR)`
	`58`	`+ message(WARNING"Use -DOPENSSL_ROOT_DIR for non-Apple OpenSSL")`
	`59`	`+ endif()`
	`60`	`+ else()`
	`61`	`+ execute_process(COMMAND brew --prefix openssl`
	`62`	`+OUTPUT_VARIABLE OPENSSL_ROOT_DIR`
	`63`	`+ OUTPUT_STRIP_TRAILING_WHITESPACE)`
	`64`	`+ endif()`
	`65`	`+ endif()`
	`66`	`+ endif()`
	`67`	`+ find_package(OpenSSL)`
`52`	`68`	`endif()`
`53`	`69`
`54`	`70`	`find_package( Threads )`

Comments

(0)