diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2014-11-04 00:00:19 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2014-11-04 00:00:19 -0500 |
| commit | 37c2f4da50957c3c27a3fe392f3d304f221b616e (patch) | |
| tree | 41c5df7eb1889e265fcb6ebbaab37149b3bd2956 /cmake | |
| parent | 86ad23eddd52cb11c5bdbb3b6505be6a0841f78b (diff) | |
| download | tigervnc-37c2f4da50957c3c27a3fe392f3d304f221b616e.tar.gz tigervnc-37c2f4da50957c3c27a3fe392f3d304f221b616e.zip | |
Back out previous change
Needed to merge upstream changes in before creating pull request.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/StaticBuild.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 49706bd3..df12db41 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -30,14 +30,9 @@ if(BUILD_STATIC) HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS}) FIND_LIBRARY(NETTLE_LIBRARY NAMES nettle libnettle HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS}) - FIND_LIBRARY(TASN1_LIBRARY NAMES tasn1 libtasn1 - HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS}) - set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls") + set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls -ltasn1") - if(TASN1_LIBRARY) - set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -ltasn1") - endif() if(NETTLE_LIBRARY) set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lnettle -lhogweed -lgmp") endif() |