From c56f7064f2d4e05ac4288b235ff8d61a0f78183c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Tue, 14 Aug 2012 00:31:06 -0400
Subject: [PATCH] libfreerdp: fix linking libraries for monolithic build

---
 libfreerdp/CMakeLists.txt          | 4 ++++
 libfreerdp/cache/CMakeLists.txt    | 2 +-
 libfreerdp/channels/CMakeLists.txt | 2 +-
 libfreerdp/codec/CMakeLists.txt    | 2 +-
 libfreerdp/core/CMakeLists.txt     | 2 +-
 libfreerdp/crypto/CMakeLists.txt   | 2 +-
 libfreerdp/gdi/CMakeLists.txt      | 2 +-
 libfreerdp/locale/CMakeLists.txt   | 2 +-
 libfreerdp/rail/CMakeLists.txt     | 2 +-
 libfreerdp/utils/CMakeLists.txt    | 2 +-
 10 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index dcbd0c36f..7f6bb5a21 100644
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -40,4 +40,8 @@ if(WITH_MONOLITHIC_BUILD)
 		$<TARGET_OBJECTS:freerdp-channels>
 		$<TARGET_OBJECTS:freerdp-locale>
 		$<TARGET_OBJECTS:freerdp-core>)
+		
+	target_link_libraries(freerdp ${FREERDP_LIBS})
 endif()
+
+
diff --git a/libfreerdp/cache/CMakeLists.txt b/libfreerdp/cache/CMakeLists.txt
index dae7004fb..940f9e409 100644
--- a/libfreerdp/cache/CMakeLists.txt
+++ b/libfreerdp/cache/CMakeLists.txt
@@ -38,7 +38,7 @@ set_target_properties(freerdp-cache PROPERTIES VERSION ${FREERDP_VERSION_FULL} S
 set(FREERDP_CACHE_LIBS)
 
 if(WITH_MONOLITHIC_BUILD)
-	
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CACHE_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_CACHE_LIBS ${FREERDP_CACHE_LIBS}
 		freerdp-core
diff --git a/libfreerdp/channels/CMakeLists.txt b/libfreerdp/channels/CMakeLists.txt
index 0c2bfdbfd..51cb08ba4 100644
--- a/libfreerdp/channels/CMakeLists.txt
+++ b/libfreerdp/channels/CMakeLists.txt
@@ -34,7 +34,7 @@ set_target_properties(freerdp-channels PROPERTIES VERSION ${FREERDP_VERSION_FULL
 set(FREERDP_CHANNELS_LIBS)
 
 if(WITH_MONOLITHIC_BUILD)
-
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CHANNELS_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_CHANNELS_LIBS ${FREERDP_CHANNELS_LIBS}
 		freerdp-utils)
diff --git a/libfreerdp/codec/CMakeLists.txt b/libfreerdp/codec/CMakeLists.txt
index 39848c028..6a03e002e 100644
--- a/libfreerdp/codec/CMakeLists.txt
+++ b/libfreerdp/codec/CMakeLists.txt
@@ -89,7 +89,7 @@ set(FREERDP_CODEC_LIBS
 	${FREERDP_JPEG_LIBS})
 
 if(WITH_MONOLITHIC_BUILD)
-
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CODEC_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_CODEC_LIBS ${FREERDP_CODEC_LIBS}
 		freerdp-utils)
diff --git a/libfreerdp/core/CMakeLists.txt b/libfreerdp/core/CMakeLists.txt
index 4a6f8fd87..5adc92607 100644
--- a/libfreerdp/core/CMakeLists.txt
+++ b/libfreerdp/core/CMakeLists.txt
@@ -117,7 +117,7 @@ endif()
 set(FREERDP_CORE_LIBS ${FREERDP_CORE_LIBS} ${OPENSSL_LIBRARIES})
 
 if(WITH_MONOLITHIC_BUILD)
-
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CORE_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_CORE_LIBS ${FREERDP_CORE_LIBS}
 		freerdp-utils
diff --git a/libfreerdp/crypto/CMakeLists.txt b/libfreerdp/crypto/CMakeLists.txt
index 412a2d29d..720c15e89 100644
--- a/libfreerdp/crypto/CMakeLists.txt
+++ b/libfreerdp/crypto/CMakeLists.txt
@@ -50,7 +50,7 @@ else()
 endif()
 
 if(WITH_MONOLITHIC_BUILD)
-	
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CRYPTO_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_CRYPTO_LIBS ${FREERDP_CRYPTO_LIBS} freerdp-utils)
 	target_link_libraries(freerdp-crypto ${FREERDP_CRYPTO_LIBS})
diff --git a/libfreerdp/gdi/CMakeLists.txt b/libfreerdp/gdi/CMakeLists.txt
index 432408b3b..2513b0673 100644
--- a/libfreerdp/gdi/CMakeLists.txt
+++ b/libfreerdp/gdi/CMakeLists.txt
@@ -49,7 +49,7 @@ set_target_properties(freerdp-gdi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOV
 set(FREERDP_GDI_LIBS)
 
 if(WITH_MONOLITHIC_BUILD)
-	
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_GDI_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_GDI_LIBS ${FREERDP_GDI_LIBS}
 		freerdp-core
diff --git a/libfreerdp/locale/CMakeLists.txt b/libfreerdp/locale/CMakeLists.txt
index b51472ccc..8e9c27035 100644
--- a/libfreerdp/locale/CMakeLists.txt
+++ b/libfreerdp/locale/CMakeLists.txt
@@ -82,7 +82,7 @@ endif()
 set_target_properties(freerdp-locale PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
 
 if(WITH_MONOLITHIC_BUILD)
-
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_LOCALE_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_LOCALE_LIBS ${FREERDP_LOCALE_LIBS} freerdp-utils)
 	target_link_libraries(freerdp-locale ${FREERDP_LOCALE_LIBS})
diff --git a/libfreerdp/rail/CMakeLists.txt b/libfreerdp/rail/CMakeLists.txt
index 3f416318c..728441ae3 100644
--- a/libfreerdp/rail/CMakeLists.txt
+++ b/libfreerdp/rail/CMakeLists.txt
@@ -35,7 +35,7 @@ set_target_properties(freerdp-rail PROPERTIES VERSION ${FREERDP_VERSION_FULL} SO
 set(FREERDP_RAIL_LIBS)
 
 if(WITH_MONOLITHIC_BUILD)
-
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_RAIL_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_RAIL_LIBS ${FREERDP_RAIL_LIBS} freerdp-utils)
 	target_link_libraries(freerdp-rail ${FREERDP_RAIL_LIBS})
diff --git a/libfreerdp/utils/CMakeLists.txt b/libfreerdp/utils/CMakeLists.txt
index 99f759a7d..4f748c40e 100644
--- a/libfreerdp/utils/CMakeLists.txt
+++ b/libfreerdp/utils/CMakeLists.txt
@@ -72,7 +72,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
 endif()
 
 if(WITH_MONOLITHIC_BUILD)
-
+	set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_UTILS_LIBS} PARENT_SCOPE)
 else()
 	target_link_libraries(freerdp-utils ${FREERDP_UTILS_LIBS})
 	install(TARGETS freerdp-utils DESTINATION ${CMAKE_INSTALL_LIBDIR})