diff options
author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
---|---|---|
committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
commit | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (patch) | |
tree | ef36b7031df4c96eab6b5f3343325f662382932c /indra/cmake/OpenSSL.cmake | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
parent | 15d8f355072f2184f046a7aafb1b5c606fe97880 (diff) |
Merge
Diffstat (limited to 'indra/cmake/OpenSSL.cmake')
-rwxr-xr-x | indra/cmake/OpenSSL.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index 2704912eb5..5b469f74f9 100755 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -4,9 +4,9 @@ include(Prebuilt) set(OpenSSL_FIND_QUIETLY ON) set(OpenSSL_FIND_REQUIRED ON) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindOpenSSL) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(openSSL) if (WINDOWS) set(OPENSSL_LIBRARIES ssleay32 libeay32) @@ -14,7 +14,7 @@ else (STANDALONE) set(OPENSSL_LIBRARIES ssl crypto) endif (WINDOWS) set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) -endif (STANDALONE) +endif (USESYSTEMLIBS) if (LINUX) set(CRYPTO_LIBRARIES crypto) |