celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [celix] branch develop updated: Updates brew install for openssl
Date Tue, 03 Dec 2019 20:22:35 GMT
This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8951cda  Updates brew install for openssl
8951cda is described below

commit 8951cda9710dc7c428f07d9491f244596e62f81c
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
AuthorDate: Tue Dec 3 21:22:08 2019 +0100

    Updates brew install for openssl
---
 .travis.yml                     |  2 +-
 cmake/Modules/FindOpenSSL.cmake | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 97e439e..8fb0dc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ matrix:
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ] &&  [ -z "$ANDROID" ]; then sudo add-apt-repository
ppa:ubuntu-toolchain-r/test -y && sudo apt-get -qq update && sudo apt-get
install -y uuid-dev libxml2-dev lcov libffi-dev gcc-4.8 g++-4.8; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
zeromq czmq openssl && brew link --force libffi && brew unlink openssl &&
brew link openssl --force; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
zeromq czmq openssl && brew link --force libffi; fi
 
 before_script:
     - wget https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz
-O /tmp/cpputest.tar.gz
diff --git a/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/FindOpenSSL.cmake
index eefbfaf..caa1f99 100644
--- a/cmake/Modules/FindOpenSSL.cmake
+++ b/cmake/Modules/FindOpenSSL.cmake
@@ -47,9 +47,16 @@ find_package_handle_standard_args(OpenSSL  DEFAULT_MSG
 mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARY CRYPTO_LIBRARY)
 
 if (OPENSSL_FOUND AND NOT TARGET OpenSSL::lib)
+    add_library(OpenSSL::crypto SHARED IMPORTED)
+    set_target_properties(OpenSSL::crypto PROPERTIES
+            IMPORTED_LOCATION "${CRYPTO_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}"
+    )
+
     add_library(OpenSSL::lib SHARED IMPORTED)
     set_target_properties(OpenSSL::lib PROPERTIES
-            IMPORTED_LOCATION "${OPENSSL_LIBRARY};${CRYPTO_LIBRARY}"
+            IMPORTED_LOCATION "${OPENSSL_LIBRARY}"
             INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}"
+            INTERFACE_LINK_LIBRARIES OpenSSL::crypto
     )
-endif ()
\ No newline at end of file
+endif ()


Mime
View raw message