From b8136a376992dc0ba037ca402e7a7c4eca6c412b Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
Date: Wed, 30 Dec 2015 18:45:09 +0100
Subject: [PATCH] build: remove FREERDP_MONOLITHIC_BUILD

FREERDP_MONOLITHIC_BUILD was obsolete for a while and unused
---
 CMakeLists.txt             |  5 +----
 FreeRDPConfig.cmake.in     |  1 -
 cmake/ComplexLibrary.cmake | 28 ----------------------------
 winpr/CMakeLists.txt       |  4 +---
 winpr/WinPRConfig.cmake.in |  1 -
 5 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 922b59719..4b19b2981 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -806,12 +806,9 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
 
 	set(FREERDP_INCLUDE_DIR "include")
 
-	# keep for legacy builds
-	set(FREERDP_MONOLITHIC_BUILD OFF)
-
 	configure_package_config_file(FreeRDPConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FreeRDPConfig.cmake
 		INSTALL_DESTINATION ${FREERDP_CMAKE_INSTALL_DIR}
-		PATH_VARS FREERDP_INCLUDE_DIR FREERDP_MONOLITHIC_BUILD)
+		PATH_VARS FREERDP_INCLUDE_DIR)
 
 	write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FreeRDPConfigVersion.cmake
 		VERSION ${FREERDP_VERSION} COMPATIBILITY SameMajorVersion)
diff --git a/FreeRDPConfig.cmake.in b/FreeRDPConfig.cmake.in
index 7dcea99de..a2321e727 100644
--- a/FreeRDPConfig.cmake.in
+++ b/FreeRDPConfig.cmake.in
@@ -4,7 +4,6 @@
 set(FreeRDP_VERSION_MAJOR "@FREERDP_VERSION_MAJOR@")
 set(FreeRDP_VERSION_MINOR "@FREERDP_VERSION_MINOR@")
 set(FreeRDP_VERSION_REVISION "@FREERDP_VERSION_REVISION@")
-set(FreeRDP_MONOLITHIC_BUILD "@FREERDP_MONOLITHIC_BUILD@")
 
 set_and_check(FreeRDP_INCLUDE_DIR "@PACKAGE_FREERDP_INCLUDE_DIR@")
 
diff --git a/cmake/ComplexLibrary.cmake b/cmake/ComplexLibrary.cmake
index c6c54aae2..703e9376a 100644
--- a/cmake/ComplexLibrary.cmake
+++ b/cmake/ComplexLibrary.cmake
@@ -3,34 +3,6 @@
 include(EchoTarget)
 include(CMakeParseArguments)
 
-macro(set_complex_link_libraries)
-
-	set(PREFIX "COMPLEX_LIBRARY")
-	
-	cmake_parse_arguments(${PREFIX}
-		"INTERNAL"
-		"MODULE;VARIABLE;MONOLITHIC"
-		"MODULES"
-		${ARGN})
-		
-	if(NOT DEFINED ${PREFIX}_MONOLITHIC)
-		set(${PREFIX}_MONOLITHIC FALSE)
-	endif()
-	
-	if(${${PREFIX}_MONOLITHIC})
-		if(${${PREFIX}_INTERNAL})
-			set(${PREFIX}_LIBS)
-		else()
-			set(${PREFIX}_LIBS ${${PREFIX}_MODULE})
-		endif()
-	else()
-		set(${PREFIX}_LIBS ${${PREFIX}_MODULES})
-	endif()
-
-	set(${${PREFIX}_VARIABLE} ${${${PREFIX}_VARIABLE}} ${${PREFIX}_LIBS})
-	
-endmacro(set_complex_link_libraries)
-
 # - add a new library to a module for export
 #  MODULE - module the library belongs to
 #  LIBNAME - name of the library
diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index 12e515e6f..1021d164e 100644
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -164,12 +164,10 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
 	set(WINPR_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/WinPR")
 
 	set(WINPR_INCLUDE_DIR "include")
-	# Keep this for legacy builds
-	set(WINPR_MONOLITHIC_BUILD OFF)
 
 	configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake
 		INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR}
-		PATH_VARS WINPR_INCLUDE_DIR WINPR_MONOLITHIC_BUILD)
+		PATH_VARS WINPR_INCLUDE_DIR)
 
 	write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/WinPRConfigVersion.cmake
 		VERSION ${WINPR_VERSION} COMPATIBILITY SameMajorVersion)
diff --git a/winpr/WinPRConfig.cmake.in b/winpr/WinPRConfig.cmake.in
index 3a7a6c005..00c69c984 100644
--- a/winpr/WinPRConfig.cmake.in
+++ b/winpr/WinPRConfig.cmake.in
@@ -4,7 +4,6 @@
 set(WinPR_VERSION_MAJOR "@WINPR_VERSION_MAJOR@")
 set(WinPR_VERSION_MINOR "@WINPR_VERSION_MINOR@")
 set(WinPR_VERSION_REVISION "@WINPR_VERSION_REVISION@")
-set(WinPR_MONOLITHIC_BUILD "@WINPR_MONOLITHIC_BUILD@")
 
 set_and_check(WinPR_INCLUDE_DIR "@PACKAGE_WINPR_INCLUDE_DIR@")