diff options
| author | simon <none@none> | 2014-07-07 16:17:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-07-07 16:17:53 -0700 |
| commit | bfa42c9e28075cb35f80e6fce7d1db0443027052 (patch) | |
| tree | b4e209e91cd173473f3c2033487647c5eb8c6b5d /indra/cmake/OpenSSL.cmake | |
| parent | 114f7b5d0f46dfcbc9a94c1907e396b6e02700f6 (diff) | |
| parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) | |
Merge downstream code and become 3.7.12
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) |