Commitacb020b

committed

OSX: update OpenSSL detection. Refs#690 #691

1 parentb8c47f9 commitacb020bCopy full SHA for acb020b

File tree

+17

-9

lines changed

+17

-9

lines changed

Lines changed: 17 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,15 +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`		`- 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`		`-execute_process (COMMANDbrew--prefixopenssl`
`56`		`-OUTPUT_VARIABLEOPENSSL_ROOT_DIR`
`57`		`-OUTPUT_STRIP_TRAILING_WHITESPACE)`
`58`		`- endif()`
`59`		`- endif()`
`60`		`-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)`
`61`	`69`	`endif()`
`62`	`70`
`63`	`71`	`find_package(Threads )`

Comments

(0)