40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
Author: Michal Srb <michalsrb@gmail.com>
|
||
|
|
Patch-Mainline: To be upstreamed
|
||
|
|
Subject: [PATCH] Build libXvnc as separate library.
|
||
|
|
|
||
|
|
So it can be used by others, not only vncconfig.
|
||
|
|
|
||
|
|
Index: tigervnc-1.12.0/unix/vncconfig/CMakeLists.txt
|
||
|
|
===================================================================
|
||
|
|
--- tigervnc-1.12.0.orig/unix/vncconfig/CMakeLists.txt
|
||
|
|
+++ tigervnc-1.12.0/unix/vncconfig/CMakeLists.txt
|
||
|
|
@@ -1,6 +1,5 @@
|
||
|
|
add_executable(vncconfig
|
||
|
|
buildtime.c
|
||
|
|
- vncExt.c
|
||
|
|
vncconfig.cxx
|
||
|
|
QueryConnectDialog.cxx)
|
||
|
|
|
||
|
|
@@ -9,7 +8,20 @@ target_include_directories(vncconfig SYSTEM PUBLIC ${X11_INCLUDE_DIR})
|
||
|
|
target_include_directories(vncconfig PUBLIC ${CMAKE_SOURCE_DIR}/common)
|
||
|
|
target_include_directories(vncconfig PUBLIC ${CMAKE_SOURCE_DIR}/unix/tx)
|
||
|
|
|
||
|
|
-target_link_libraries(vncconfig tx rfb network rdr ${X11_LIBRARIES})
|
||
|
|
+include(GNUInstallDirs)
|
||
|
|
+
|
||
|
|
+add_library(Xvnc SHARED
|
||
|
|
+ vncExt.c)
|
||
|
|
+
|
||
|
|
+set_target_properties(Xvnc
|
||
|
|
+ PROPERTIES
|
||
|
|
+ VERSION 1.0.0
|
||
|
|
+ SOVERSION 1
|
||
|
|
+)
|
||
|
|
+
|
||
|
|
+target_link_libraries(vncconfig tx rfb network rdr Xvnc ${X11_LIBRARIES})
|
||
|
|
|
||
|
|
install(TARGETS vncconfig DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
|
||
|
|
+install(TARGETS Xvnc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RENAME libXvnc.so)
|
||
|
|
install(FILES vncconfig.man DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1 RENAME vncconfig.1)
|
||
|
|
+install(FILES vncExt.h DESTINATION ${X11_INCLUDE_DIR}/X11/extensions RENAME Xvnc.h)
|