summaryrefslogtreecommitdiff
path: root/indra/cmake/OpenSSL.cmake
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-04-15 22:48:52 +0000
committerMonty Brandenberg <monty@lindenlab.com>2014-04-15 22:48:52 +0000
commitf8874d04b8ca238ee99dc464055295cff417a9b2 (patch)
tree74e277421da416ce6222664d9caee8e144940b53 /indra/cmake/OpenSSL.cmake
parent04404b68b56638171bc200f9a22a660257370d5d (diff)
Linux/Win: Bad checksum on Windows package. Libz and libpng linking changes to find newest code.
Windows autobuild package had a bad checksum due to oddities in the build system. On Linux I've been fighting with getting libz 1.2.8 and libpng 1.6.8 to be the definitive version in the viewer. Problem is the *massive* library search tree we assemble. We find older shared library versions first and so those dominated. By using --whole-archive with static libraries, the packaged versions of these libraries are made definitive.
Diffstat (limited to 'indra/cmake/OpenSSL.cmake')
-rwxr-xr-xindra/cmake/OpenSSL.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 2704912eb5..4593821921 100755
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -17,7 +17,7 @@ else (STANDALONE)
endif (STANDALONE)
if (LINUX)
- set(CRYPTO_LIBRARIES crypto)
+ set(CRYPTO_LIBRARIES crypto dl)
elseif (DARWIN)
set(CRYPTO_LIBRARIES crypto)
endif (LINUX)