From 8ee5475447d33b9f856607f8035c23c8e0aa1b07 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 12 Nov 2019 17:10:20 +0000 Subject: [PATCH] Removed openssl@1.1 due to problems supporting multiple macOS versions --- CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75855d2a..a2297311 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -293,12 +293,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") ${OPENSSL_ROOT}/lib/libcrypto.lib ) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - #Try use 1.1 for the latest features. otherwise use the default - IF(EXISTS /usr/local/opt/openssl@1.1) - set (OPENSSL_ROOT /usr/local/opt/openssl@1.1) - else() - set (OPENSSL_ROOT /usr/local/opt/openssl) - endif() + set (OPENSSL_ROOT /usr/local/opt/openssl) include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include) set (OPENSSL_LIBS ${OPENSSL_ROOT}/lib/libssl.a @@ -325,7 +320,7 @@ macro (configure_files srcDir destDir) set (sourceFilePath ${srcDir}/${sourceFile}) if (IS_DIRECTORY ${sourceFilePath}) message (STATUS "Copying directory ${sourceFile}") - make_directory (${destDir/${sourceFile}) + make_directory (${destDir}/${sourceFile}) else() message (STATUS "Copying file ${sourceFile}") configure_file (${sourceFilePath} ${destDir}/${sourceFile} COPYONLY)