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 2f7c7ad3230a2cf302affb9d33691b933f18834c..b4cfb3c406008d6c435ddb3db9d1a8457d59e1df 100644 (file)
--- 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 e93c74b5d86c4e5c90d5eac44a48fe99afe3c87f..deaf2f968bc741aa3e1ea5eea8fa7d1b64a3919f 100644 (file)
--- 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 429d0c72a2c0aa792f9fb6a93a142ca6cab27669..05d8c1957898f9a12ff2dd5f69cfa86debaa6e05 100644 (file)
--- 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 85cdc2db92320a4a75362a30e343f7fb440aa26c..f8fbf45a2b5c3eb027ce9f8872b3af90514f9519 100644 (file)
--- 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})