From 41437fab52f6b07278ddd31e3abffb562e859de6 Mon Sep 17 00:00:00 2001 From: Keita Date: Sat, 6 Mar 2021 19:53:54 +0900 Subject: [PATCH] =?UTF-8?q?macOS=E3=81=A7=E3=81=AFhomebrew=E3=81=AElibssl?= =?UTF-8?q?=E3=81=A8cmake=E3=81=AE=E9=80=A3=E6=90=BA=E3=81=AB=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=81=82=E3=82=8A(#59)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc7f084..2a2a6eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,10 @@ set(CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -DDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -march=native -DNDEBUG") -if(UNIX) + + +if(UNIX AND (NOT APPLE)) + message(STATUS "afiejanfonw") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-O1,--sort-common,--as-needed,-z,relro") elseif(WIN32 OR APPLE) #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-O1,--sort-common,--as-needed") @@ -65,7 +68,15 @@ endif() # Search OpenSSL -if(UNIX OR APPLE) +if (APPLE) + # This is a bug in CMake that causes it to prefer the system version over + # the one in the specified ROOT folder. + find_package(PkgConfig REQUIRED) + find_package(OpenSSL REQUIRED) + set(OPENSSL_CRYPTO_LIBRARY ${OPENSSL_ROOT_DIR}/lib/libcrypto.dylib CACHE FILEPATH "" FORCE) + set(OPENSSL_SSL_LIBRARY ${OPENSSL_ROOT_DIR}/lib/libssl.dylib CACHE FILEPATH "" FORCE) + set(OPENSSL_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) +elseif(UNIX) find_package(PkgConfig REQUIRED) find_package(OpenSSL REQUIRED) if(NOT OPENSSL_FOUND)