diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2014-11-04 00:03:24 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2014-11-04 00:03:24 -0500 |
| commit | 44759765fc36417d5fdd58b161f8d54f23d3f65e (patch) | |
| tree | bcce775e39395075bb83d2a8167eda7f3a9104e7 | |
| parent | 37c2f4da50957c3c27a3fe392f3d304f221b616e (diff) | |
| download | tigervnc-44759765fc36417d5fdd58b161f8d54f23d3f65e.tar.gz tigervnc-44759765fc36417d5fdd58b161f8d54f23d3f65e.zip | |
Static build fix - only attempt to link against libtasn1 if it's present
GnuTLS may be compiled without external libtasn1, so we shouldn't try
to link against it unless it's actually present.
| -rw-r--r-- | cmake/StaticBuild.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index df12db41..49706bd3 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -30,9 +30,14 @@ 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 -ltasn1") + set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls") + if(TASN1_LIBRARY) + set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -ltasn1") + endif() if(NETTLE_LIBRARY) set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lnettle -lhogweed -lgmp") endif() |