Commit6a7e92c

authored

Merge pull request#691 from anonimal/fix-690

OSX: fix OpenSSL detection for 10.11.Fixes#690

2 parentseedd031 +acb020b commit6a7e92cCopy full SHA for 6a7e92c

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
`@@ -49,7 +49,23 @@ set(Boost_USE_MULTI_THREADED ON)`
`49`	`49`	`find_package(Boost1.58.0REQUIREDCOMPONENTSsystemthread)`
`50`	`50`
`51`	`51`	`if (CPP-NETLIB_ENABLE_HTTPS)`
`52`		`-find_package(OpenSSL )`
	`52`	`+ if (APPLE)`
	`53`	`+# If we're on OS X check for Homebrew's copy of OpenSSL instead of Apple's`
	`54`	`+ if (NOTOpenSSL_DIR)`
	`55`	`+find_program(HOMEBREWbrew)`
	`56`	`+ if (HOMEBREWSTREQUAL"HOMEBREW-NOTFOUND")`
	`57`	`+message(WARNING"Homebrew not found: not using Homebrew's OpenSSL")`
	`58`	`+ if (NOTOPENSSL_ROOT_DIR)`
	`59`	`+message(WARNING"Use -DOPENSSL_ROOT_DIR for non-Apple OpenSSL")`
	`60`	`+ endif()`
	`61`	`+ else()`
	`62`	`+execute_process(COMMANDbrew--prefixopenssl`
	`63`	`+OUTPUT_VARIABLEOPENSSL_ROOT_DIR`
	`64`	`+OUTPUT_STRIP_TRAILING_WHITESPACE)`
	`65`	`+ endif()`
	`66`	`+ endif()`
	`67`	`+ endif()`
	`68`	`+find_package(OpenSSL)`
`53`	`69`	`endif()`
`54`	`70`
`55`	`71`	`find_package(Threads )`

Comments

(0)