From c3f003bf5b8696782628c1c118982aae3b215f98 Mon Sep 17 00:00:00 2001 From: Adam Potolsky Date: Fri, 1 May 2015 16:56:45 -0700 Subject: [PATCH] Adding new binary installer locations to make files #4587 --- src/lib/plugin/ns/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/plugin/ns/CMakeLists.txt b/src/lib/plugin/ns/CMakeLists.txt index 952ae76e..653205e3 100644 --- a/src/lib/plugin/ns/CMakeLists.txt +++ b/src/lib/plugin/ns/CMakeLists.txt @@ -30,7 +30,8 @@ if (WIN32) endif() if (APPLE) - set(OPENSSL_INCLUDE ../../../../ext/openssl/include) + set(OPENSSL_PLAT_DIR openssl-osx) + set(OPENSSL_INCLUDE ../../../../ext/${OPENSSL_PLAT_DIR}/include) endif() include_directories( @@ -51,8 +52,8 @@ endif() if (UNIX) if (APPLE) set(OPENSSL_LIBS - ${CMAKE_SOURCE_DIR}/ext/openssl/libssl.a - ${CMAKE_SOURCE_DIR}/ext/openssl/libcrypto.a + ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a + ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a ) else() set(OPENSSL_LIBS ssl crypto)