From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 17 Oct 2014 11:50:12 +0000 (+0200)
Subject: Link basic X11 libraries last
X-Git-Tag: v1.3.90~20^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=42c379ef3cda9e002970a6888a256d349d3e3b39;p=tigervnc.git

Link basic X11 libraries last

The extension libraries might depend on libXext or libX11, so
make sure they come last on the link line.
---

diff --git a/unix/x0vncserver/CMakeLists.txt b/unix/x0vncserver/CMakeLists.txt
index 64c9e779..82f0d2ac 100644
--- a/unix/x0vncserver/CMakeLists.txt
+++ b/unix/x0vncserver/CMakeLists.txt
@@ -15,7 +15,7 @@ add_executable(x0vncserver
   ../vncconfig/QueryConnectDialog.cxx
 )
 
-target_link_libraries(x0vncserver tx rfb network rdr ${X11_LIBRARIES})
+target_link_libraries(x0vncserver tx rfb network rdr)
 
 if(X11_FOUND AND X11_XTest_LIB)
   add_definitions(-DHAVE_XTEST)
@@ -31,5 +31,7 @@ else()
   message(WARNING "No DAMAGE extension.  x0vncserver will have to use the slower polling method.")
 endif()
 
+target_link_libraries(x0vncserver ${X11_LIBRARIES})
+
 install(TARGETS x0vncserver DESTINATION ${BIN_DIR})
 install(FILES x0vncserver.man DESTINATION ${MAN_DIR}/man1 RENAME x0vncserver.1)