tjh.dev
1diff -ruZ source/CMakeLists.txt source2/CMakeLists.txt
2--- source/CMakeLists.txt 1969-12-31 17:00:01.000000000 -0700
3+++ source2/CMakeLists.txt 2024-11-03 21:24:22.153712626 -0700
4@@ -12,9 +12,6 @@
5
6 set(WXSERVDISC_INSTALL OFF CACHE BOOL "Set to OFF to not include wxservdisc artifacts in install")
7 add_subdirectory(libwxservdisc/src)
8-set(LIBVNCSERVER_INSTALL OFF CACHE BOOL "Set to OFF to not include libvncserver artifacts in install")
9-set(WITH_EXAMPLES OFF CACHE BOOL "Set to OFF to not build libvncserver examples")
10-add_subdirectory(libvncserver)
11
12 add_subdirectory(src)
13
14diff -ruZ source/src/CMakeLists.txt source2/src/CMakeLists.txt
15--- source/src/CMakeLists.txt 1969-12-31 17:00:01.000000000 -0700
16+++ source2/src/CMakeLists.txt 2024-11-03 21:51:56.015301604 -0700
17@@ -1,15 +1,17 @@
18 #
19 # dependencies
20 #
21+include(FindPkgConfig)
22 find_package(wxWidgets 3.0 REQUIRED core base net adv qa)
23+find_package(LibVNCServer)
24+pkg_search_module(GTK3 REQUIRED gtk+-3.0)
25 include(${wxWidgets_USE_FILE})
26 include_directories(
27 ${CMAKE_BINARY_DIR}
28 ${CMAKE_SOURCE_DIR}
29 ${CMAKE_SOURCE_DIR}/src/
30 ${CMAKE_SOURCE_DIR}/libwxservdisc/src
31- ${CMAKE_SOURCE_DIR}/libvncserver
32- ${CMAKE_BINARY_DIR}/libvncserver
33+ ${GTK3_INCXLUDE_DIRS}
34 )
35
36
37@@ -39,7 +41,7 @@
38
39 add_executable(${executable_name} MACOSX_BUNDLE ${multivnc_SRCS})
40
41-target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient)
42+target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient ${GTK3_LIBRARIES})
43
44 if(APPLE AND wxWidgets_VERSION_STRING LESS 3.1)
45 set_target_properties(${executable_name} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in)
46@@ -47,7 +49,6 @@
47
48
49
50-
51
52 #original Makefile.am contents follow:
53
54diff -ruZ source/src/VNCConn.h source2/src/VNCConn.h
55--- source/src/VNCConn.h 1969-12-31 17:00:01.000000000 -0700
56+++ source2/src/VNCConn.h 2024-11-03 21:28:06.620032553 -0700
57@@ -37,7 +37,7 @@
58 #include <wx/secretstore.h>
59 #endif
60 #include <wx/msgqueue.h>
61-#include "rfb/rfbclient.h"
62+#include <rfb/rfbclient.h>
63
64
65