From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 24 Mar 2023 18:34:27 +0000 (+0100)
Subject: Add all common inter-dependencies
X-Git-Tag: v1.13.90~79
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=00dc3c0c8d14d2d281e9e273f78abe6d44ed537e;p=tigervnc.git

Add all common inter-dependencies

This is important in case there are build flags that need to propagate
between libraries for things to build correctly.
---

diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
index 2f7c7ad3..b4cfb3c4 100644
--- a/common/network/CMakeLists.txt
+++ b/common/network/CMakeLists.txt
@@ -8,6 +8,8 @@ if(NOT WIN32)
   target_sources(network PRIVATE UnixSocket.cxx)
 endif()
 
+target_link_libraries(network os rdr rfb)
+
 if(WIN32)
 	target_link_libraries(network ws2_32)
 endif()
diff --git a/common/os/CMakeLists.txt b/common/os/CMakeLists.txt
index e93c74b5..deaf2f96 100644
--- a/common/os/CMakeLists.txt
+++ b/common/os/CMakeLists.txt
@@ -5,6 +5,8 @@ add_library(os STATIC
   Thread.cxx
   os.cxx)
 
+target_link_libraries(os rdr)
+
 if(UNIX)
   target_link_libraries(os pthread)
 endif()
diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
index 429d0c72..05d8c195 100644
--- a/common/rdr/CMakeLists.txt
+++ b/common/rdr/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(rdr STATIC
   ZlibInStream.cxx
   ZlibOutStream.cxx)
 
-target_link_libraries(rdr ${ZLIB_LIBRARIES} os)
+target_link_libraries(rdr ${ZLIB_LIBRARIES} os rfb)
 
 if(GNUTLS_FOUND)
   include_directories(SYSTEM ${GNUTLS_INCLUDE_DIR})
diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
index 85cdc2db..f8fbf45a 100644
--- a/common/rfb/CMakeLists.txt
+++ b/common/rfb/CMakeLists.txt
@@ -66,7 +66,7 @@ add_library(rfb STATIC
   obfuscate.cxx
   util.cxx)
 
-target_link_libraries(rfb os rdr)
+target_link_libraries(rfb os rdr network)
 target_link_libraries(rfb ${JPEG_LIBRARIES} ${PIXMAN_LIBRARIES})
 target_link_directories(rfb PUBLIC ${PIXMAN_LIBRARY_DIRS})