diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-10-28 16:59:02 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-10-28 16:59:02 +0100 |
| commit | 5b9303a697ffc056a337a4da42c8bea8942a7dd1 (patch) | |
| tree | c93acd7fc36f5fea11c864dc34574045445eb4d5 /cmake | |
| parent | 95491397a500dddc38583af8830c688a11ff36e5 (diff) | |
| download | tigervnc-5b9303a697ffc056a337a4da42c8bea8942a7dd1.tar.gz tigervnc-5b9303a697ffc056a337a4da42c8bea8942a7dd1.zip | |
Include gettext and zlib in static GnuTLS link
This is needed to make sure they are always included, and in the
proper order.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/StaticBuild.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 46204b55..8f06a148 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -51,6 +51,15 @@ if(BUILD_STATIC) if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lrt") endif() + + # GnuTLS uses gettext and zlib, so make sure those are always + # included and in the proper order + set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} ${ZLIB_LIBRARIES}") + set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} ${GETTEXT_LIBRARIES}") + + # The last variables might introduce whitespace, which CMake + # throws a hissy fit about + string(STRIP ${GNUTLS_LIBRARIES} GNUTLS_LIBRARIES) endif() if(FLTK_FOUND) |