39 lines
1.2 KiB
Diff
39 lines
1.2 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.
|
||
|
|
|
||
|
|
diff --git a/unix/vncconfig/CMakeLists.txt b/unix/vncconfig/CMakeLists.txt
|
||
|
|
index 959681f..5fe1fb8 100644
|
||
|
|
--- a/unix/vncconfig/CMakeLists.txt
|
||
|
|
+++ b/unix/vncconfig/CMakeLists.txt
|
||
|
|
@@ -3,13 +3,25 @@ include_directories(${X11_INCLUDE_DIR})
|
||
|
|
include_directories(${CMAKE_SOURCE_DIR}/common)
|
||
|
|
include_directories(${CMAKE_SOURCE_DIR}/unix/tx)
|
||
|
|
|
||
|
|
+include(GNUInstallDirs)
|
||
|
|
+
|
||
|
|
+add_library(Xvnc SHARED
|
||
|
|
+ vncExt.c)
|
||
|
|
+
|
||
|
|
+set_target_properties(Xvnc
|
||
|
|
+ PROPERTIES
|
||
|
|
+ VERSION 1.0.0
|
||
|
|
+ SOVERSION 1
|
||
|
|
+)
|
||
|
|
+
|
||
|
|
add_executable(vncconfig
|
||
|
|
buildtime.c
|
||
|
|
- vncExt.c
|
||
|
|
vncconfig.cxx
|
||
|
|
QueryConnectDialog.cxx)
|
||
|
|
|
||
|
|
-target_link_libraries(vncconfig tx rfb network rdr ${X11_LIBRARIES})
|
||
|
|
+target_link_libraries(vncconfig tx rfb network rdr Xvnc ${X11_LIBRARIES})
|
||
|
|
|
||
|
|
install(TARGETS vncconfig DESTINATION ${BIN_DIR})
|
||
|
|
+install(TARGETS Xvnc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RENAME libXvnc.so)
|
||
|
|
install(FILES vncconfig.man DESTINATION ${MAN_DIR}/man1 RENAME vncconfig.1)
|
||
|
|
+install(FILES vncExt.h DESTINATION ${X11_INCLUDE_DIR}/X11/extensions RENAME Xvnc.h)
|