cmake: rename WITH_MONOLITHIC_BUILD to MONOLITHIC_BUILD

2012-10-08 22:55:06 -04:00 · 2012-10-08 22:55:06 -04:00 · 40eea7c76b
parent ce71721698
commit 40eea7c76b
72 changed files with 123 additions and 123 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -64,7 +64,7 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
 	set(BUILD_SHARED_LIBS ON)
 endif()

-if(NOT BUILD_SHARED_LIBS AND WITH_MONOLITHIC_BUILD)
+if(NOT BUILD_SHARED_LIBS AND MONOLITHIC_BUILD)
 	set(STATIC_CHANNELS ON)
 endif()

--- a/channels/audin/client/CMakeLists.txt
+++ b/channels/audin/client/CMakeLists.txt
@ -27,7 +27,7 @@ include_directories(..)
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils)
--- a/channels/audin/client/alsa/CMakeLists.txt
+++ b/channels/audin/client/alsa/CMakeLists.txt
@ -26,7 +26,7 @@ include_directories(${ALSA_INCLUDE_DIRS})
 add_library(audin_alsa ${AUDIN_ALSA_SRCS})
 set_target_properties(audin_alsa PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(audin_alsa freerdp)
 else()
 	target_link_libraries(audin_alsa freerdp-utils)
--- a/channels/audin/client/pulse/CMakeLists.txt
+++ b/channels/audin/client/pulse/CMakeLists.txt
@ -27,7 +27,7 @@ include_directories(${PULSEAUDIO_INCLUDE_DIR})
 add_library(audin_pulse ${AUDIN_PULSE_SRCS})
 set_target_properties(audin_pulse PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(audin_pulse freerdp)
 else()
 	target_link_libraries(audin_pulse freerdp-utils)
--- a/channels/audin/server/CMakeLists.txt
+++ b/channels/audin/server/CMakeLists.txt
@ -21,7 +21,7 @@ set(${MODULE_PREFIX}_SRCS
 	audin.c
 	PARENT_SCOPE)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS freerdp PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS freerdp-utils freerdp-channels PARENT_SCOPE)
--- a/channels/cliprdr/client/CMakeLists.txt
+++ b/channels/cliprdr/client/CMakeLists.txt
@ -35,7 +35,7 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})

 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils)
--- a/channels/disk/client/CMakeLists.txt
+++ b/channels/disk/client/CMakeLists.txt
@ -46,7 +46,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS freerdp winpr)
 else()
 	set(${MODULE_PREFIX}_LIBS freerdp-utils winpr-crt winpr-synch winpr-thread winpr-interlocked)
--- a/channels/drdynvc/client/CMakeLists.txt
+++ b/channels/drdynvc/client/CMakeLists.txt
@ -35,7 +35,7 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})

 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp winpr)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils winpr-synch)
--- a/channels/parallel/client/CMakeLists.txt
+++ b/channels/parallel/client/CMakeLists.txt
@ -25,7 +25,7 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils winpr-interlocked)
--- a/channels/printer/client/CMakeLists.txt
+++ b/channels/printer/client/CMakeLists.txt
@ -41,7 +41,7 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp winpr)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils winpr-crt winpr-synch winpr-thread winpr-interlocked)
--- a/channels/rail/client/CMakeLists.txt
+++ b/channels/rail/client/CMakeLists.txt
@ -34,7 +34,7 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})

 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils)
--- a/channels/rdpdr/client/CMakeLists.txt
+++ b/channels/rdpdr/client/CMakeLists.txt
@ -38,7 +38,7 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})

 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp winpr)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils winpr-crt winpr-synch winpr-thread winpr-interlocked)
--- a/channels/rdpsnd/client/CMakeLists.txt
+++ b/channels/rdpsnd/client/CMakeLists.txt
@ -32,7 +32,7 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})

 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils)
--- a/channels/rdpsnd/client/MacAudio/CMakeLists.txt
+++ b/channels/rdpsnd/client/MacAudio/CMakeLists.txt
@ -25,7 +25,7 @@ include_directories(${MACAUDIO_INCLUDE_DIRS})
 add_library(rdpsnd_macaudio ${RDPSND_MACAUDIO_SRCS})
 set_target_properties(rdpsnd_macaudio PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(rdpsnd_macaudio freerdp)
 else()
 	target_link_libraries(rdpsnd_macaudio freerdp-utils)
--- a/channels/rdpsnd/client/alsa/CMakeLists.txt
+++ b/channels/rdpsnd/client/alsa/CMakeLists.txt
@ -27,7 +27,7 @@ include_directories(${ALSA_INCLUDE_DIRS})
 add_library(rdpsnd_alsa ${RDPSND_ALSA_SRCS})
 set_target_properties(rdpsnd_alsa PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(rdpsnd_alsa freerdp)
 else()
 	target_link_libraries(rdpsnd_alsa freerdp-utils)
--- a/channels/rdpsnd/client/pulse/CMakeLists.txt
+++ b/channels/rdpsnd/client/pulse/CMakeLists.txt
@ -26,7 +26,7 @@ include_directories(${PULSEAUDIO_INCLUDE_DIR})
 add_library(rdpsnd_pulse ${RDPSND_PULSE_SRCS})
 set_target_properties(rdpsnd_pulse PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(rdpsnd_pulse freerdp)
 else()
 	target_link_libraries(rdpsnd_pulse freerdp-utils)
--- a/channels/rdpsnd/server/CMakeLists.txt
+++ b/channels/rdpsnd/server/CMakeLists.txt
@ -22,7 +22,7 @@ set(${MODULE_PREFIX}_SRCS
 	rdpsnd.c
 	PARENT_SCOPE)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS freerdp PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS freerdp-utils PARENT_SCOPE)
--- a/channels/sample/client/CMakeLists.txt
+++ b/channels/sample/client/CMakeLists.txt
@ -25,7 +25,7 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils)
--- a/channels/serial/client/CMakeLists.txt
+++ b/channels/serial/client/CMakeLists.txt
@ -27,7 +27,7 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 set_target_properties(serial PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils)
--- a/channels/smartcard/client/CMakeLists.txt
+++ b/channels/smartcard/client/CMakeLists.txt
@ -27,7 +27,7 @@ include_directories(${PCSC_INCLUDE_DIRS})
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp winpr)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils winpr-crt winpr-synch winpr-thread winpr-interlocked)
--- a/channels/tsmf/client/CMakeLists.txt
+++ b/channels/tsmf/client/CMakeLists.txt
@ -40,7 +40,7 @@ include_directories(..)
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 else()
 	target_link_libraries(${MODULE_NAME} freerdp-utils)
--- a/channels/tsmf/client/alsa/CMakeLists.txt
+++ b/channels/tsmf/client/alsa/CMakeLists.txt
@ -27,7 +27,7 @@ include_directories(${ALSA_INCLUDE_DIRS})
 add_library(tsmf_alsa ${TSMF_ALSA_SRCS})
 set_target_properties(tsmf_alsa PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(tsmf_alsa freerdp)
 else()
 	target_link_libraries(tsmf_alsa freerdp-utils)
--- a/channels/tsmf/client/ffmpeg/CMakeLists.txt
+++ b/channels/tsmf/client/ffmpeg/CMakeLists.txt
@ -34,7 +34,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	endif()
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(tsmf_ffmpeg freerdp)
 else()
 	target_link_libraries(tsmf_ffmpeg freerdp-utils)
--- a/channels/tsmf/client/gstreamer/CMakeLists.txt
+++ b/channels/tsmf/client/gstreamer/CMakeLists.txt
@ -27,7 +27,7 @@ include_directories(${GSTREAMER_INCLUDE_DIRS})
 add_library(tsmf_gstreamer ${TSMF_GSTREAMER_SRCS})
 set_target_properties(tsmf_gstreamer PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(tsmf_gstreamer freerdp)
 else()
 	target_link_libraries(tsmf_gstreamer freerdp-utils)
--- a/channels/tsmf/client/pulse/CMakeLists.txt
+++ b/channels/tsmf/client/pulse/CMakeLists.txt
@ -26,7 +26,7 @@ include_directories(${PULSEAUDIO_INCLUDE_DIR})
 add_library(tsmf_pulse ${TSMF_PULSE_SRCS})
 set_target_properties(tsmf_pulse PROPERTIES PREFIX "")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY} freerdp)
 else()
 	target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY} freerdp-utils)
--- a/channels/urbdrc/client/CMakeLists.txt
+++ b/channels/urbdrc/client/CMakeLists.txt
@ -40,7 +40,7 @@ set(${MODULE_PREFIX}_LIBS
 	udev
 	uuid)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)
 	target_link_libraries(${MODULE_NAME} ${MODULE_PREFIX}_LIBS)
 else()
--- a/client/DirectFB/CMakeLists.txt
+++ b/client/DirectFB/CMakeLists.txt
@ -32,7 +32,7 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

 set(${MODULE_PREFIX}_LIBS ${DIRECTFB_LIBRARIES})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
--- a/client/Sample/CMakeLists.txt
+++ b/client/Sample/CMakeLists.txt
@ -25,7 +25,7 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${CMAKE_DL_LIBS})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@ -36,7 +36,7 @@ set(${MODULE_PREFIX}_SRCS

 add_executable(${MODULE_NAME} WIN32 ${${MODULE_PREFIX}_SRCS})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)

 	if(WITH_RDPDR AND STATIC_CHANNELS)
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@ -96,7 +96,7 @@ include_directories(${CMAKE_SOURCE_DIR}/resources)

 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-channels-client)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
--- a/cmake/BuildFeatureCheck.cmake
+++ b/cmake/BuildFeatureCheck.cmake
@ -16,12 +16,12 @@
 # limitations under the License.
 #=============================================================================

-# If WITH_MONOLITHIC_BUILD is used with cmake < 2.8.8 build fails
-if (WITH_MONOLITHIC_BUILD)
+# If MONOLITHIC_BUILD is used with cmake < 2.8.8 build fails
+if (MONOLITHIC_BUILD)
 	if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
-		message(FATAL_ERROR "CMAKE version >= 2.8.8 required for WITH_MONOLITHIC_BUILD")
+		message(FATAL_ERROR "CMAKE version >= 2.8.8 required for MONOLITHIC_BUILD")
 	endif()
-endif(WITH_MONOLITHIC_BUILD)
+endif(MONOLITHIC_BUILD)

 # GetGitRevisionDescription requires FindGit which was added in version 2.8.2
 # build won't fail but GIT_REVISION is set to n/a
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@ -18,7 +18,7 @@ endif()
 option(BUILD_TESTING "Build unit tests" OFF)

 if(${CMAKE_VERSION} VERSION_GREATER 2.8.8)
-	option(WITH_MONOLITHIC_BUILD "Use monolithic build" OFF)
+	option(MONOLITHIC_BUILD "Use monolithic build" OFF)
 endif()

 option(WITH_CLIENT "Build client binaries" ON)
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@ -18,7 +18,7 @@
 set(MODULE_NAME "freerdp")
 set(MODULE_PREFIX "FREERDP")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()

@ -37,7 +37,7 @@ foreach(${MODULE_PREFIX}_SUBMODULE ${${MODULE_PREFIX}_SUBMODULES})
 	add_subdirectory(${${MODULE_PREFIX}_SUBMODULE})
 endforeach()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	
 	foreach(${MODULE_PREFIX}_SUBMODULE ${${MODULE_PREFIX}_SUBMODULES})
 		set(${MODULE_PREFIX}_OBJECTS ${${MODULE_PREFIX}_OBJECTS} "$<TARGET_OBJECTS:${MODULE_NAME}-${${MODULE_PREFIX}_SUBMODULE}>")
--- a/libfreerdp/cache/CMakeLists.txt
+++ b/libfreerdp/cache/CMakeLists.txt
@ -28,7 +28,7 @@ set(${MODULE_PREFIX}_SRCS
 	glyph.c
 	cache.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -36,7 +36,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
--- a/libfreerdp/channels/CMakeLists.txt
+++ b/libfreerdp/channels/CMakeLists.txt
@ -24,7 +24,7 @@ set(${MODULE_PREFIX}_SRCS
 	wtsvc.c
 	wtsvc.h)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -36,7 +36,7 @@ if(STATIC_CHANNELS)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-channels-client)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
--- a/libfreerdp/codec/CMakeLists.txt
+++ b/libfreerdp/codec/CMakeLists.txt
@ -78,7 +78,7 @@ if(WITH_JPEG)
 	set(FREERDP_JPEG_LIBS jpeg)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -89,7 +89,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL}
 set(${MODULE_PREFIX}_LIBS
 	${FREERDP_JPEG_LIBS})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
--- a/libfreerdp/core/CMakeLists.txt
+++ b/libfreerdp/core/CMakeLists.txt
@ -92,7 +92,7 @@ set(${MODULE_PREFIX}_SRCS
 	peer.c
 	peer.h)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -100,7 +100,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS winpr)
 else()
 	set(${MODULE_PREFIX}_LIBS
@ -120,7 +120,7 @@ endif()

 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${OPENSSL_LIBRARIES})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
--- a/libfreerdp/crypto/CMakeLists.txt
+++ b/libfreerdp/crypto/CMakeLists.txt
@ -28,7 +28,7 @@ set(${MODULE_PREFIX}_SRCS
 	crypto.c
 	tls.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -42,7 +42,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL}
 set(${MODULE_PREFIX}_LIBS
 	${OPENSSL_LIBRARIES})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr-sspi)
@ -58,7 +58,7 @@ else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${ZLIB_LIBRARIES})
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-utils)
--- a/libfreerdp/gdi/CMakeLists.txt
+++ b/libfreerdp/gdi/CMakeLists.txt
@ -39,7 +39,7 @@ set(${MODULE_PREFIX}_SRCS
 	gdi.c
 	gdi.h)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -47,7 +47,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
--- a/libfreerdp/locale/CMakeLists.txt
+++ b/libfreerdp/locale/CMakeLists.txt
@ -72,7 +72,7 @@ if(NOT WIN32)
 	endif()
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -80,7 +80,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-utils)
--- a/libfreerdp/rail/CMakeLists.txt
+++ b/libfreerdp/rail/CMakeLists.txt
@ -25,7 +25,7 @@ set(${MODULE_PREFIX}_SRCS
 	rail.c
 	librail.h)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -33,7 +33,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(FREERDP_RAIL_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-utils)
--- a/libfreerdp/utils/CMakeLists.txt
+++ b/libfreerdp/utils/CMakeLists.txt
@ -52,7 +52,7 @@ if(NOT WIN32)
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} msusb.c)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -72,7 +72,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rt)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 	set(FREERDP_LIBS ${FREERDP_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
--- a/server/Sample/CMakeLists.txt
+++ b/server/Sample/CMakeLists.txt
@ -28,7 +28,7 @@ set(${MODULE_PREFIX}_SRCS

 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME}
 		freerdp
 		freerdp-channels-server)
--- a/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@ -51,7 +51,7 @@ if(WITH_WIN8)
 	set(${MODULE_PREFIX}_LIBS d3d11 dxgi dxguid)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)
 else()

--- a/server/X11/CMakeLists.txt
+++ b/server/X11/CMakeLists.txt
@ -63,7 +63,7 @@ if(WITH_XTEST)
        target_link_libraries(${MODULE_NAME} ${XTEST_LIBRARIES})
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} freerdp)
 	target_link_libraries(${MODULE_NAME} winpr)
 else()
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@ -24,7 +24,7 @@ if (APPLE)
 	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-flat_namespace,-undefined,warning")	
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()

@ -42,7 +42,7 @@ foreach(${MODULE_PREFIX}_SUBMODULE ${${MODULE_PREFIX}_SUBMODULES})
 	add_subdirectory(${${MODULE_PREFIX}_SUBMODULE})
 endforeach()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 	foreach(${MODULE_PREFIX}_SUBMODULE ${${MODULE_PREFIX}_SUBMODULES})
 		set(${MODULE_PREFIX}_OBJECTS ${${MODULE_PREFIX}_OBJECTS} "$<TARGET_OBJECTS:${MODULE_NAME}-${${MODULE_PREFIX}_SUBMODULE}>")
--- a/winpr/libwinpr/asn1/CMakeLists.txt
+++ b/winpr/libwinpr/asn1/CMakeLists.txt
@ -21,11 +21,11 @@ set(MODULE_PREFIX "WINPR_ASN1")
 set(${MODULE_PREFIX}_SRCS
 	asn1.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -33,7 +33,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	
 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/bcrypt/CMakeLists.txt
+++ b/winpr/libwinpr/bcrypt/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_BCRYPT")
 set(${MODULE_PREFIX}_SRCS
 	bcrypt.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -35,7 +35,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SO
 set(${MODULE_PREFIX}_LIBS
 	${ZLIB_LIBRARIES})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	if(NOT WIN32)
--- a/winpr/libwinpr/crt/CMakeLists.txt
+++ b/winpr/libwinpr/crt/CMakeLists.txt
@ -24,11 +24,11 @@ set(${MODULE_PREFIX}_SRCS
 	memory.c
 	string.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -36,7 +36,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/dsparse/CMakeLists.txt
+++ b/winpr/libwinpr/dsparse/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_DSPARSE")
 set(${MODULE_PREFIX}_SRCS
 	dsparse.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/environment/CMakeLists.txt
+++ b/winpr/libwinpr/environment/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_ENVIRONMENT")
 set(${MODULE_PREFIX}_SRCS
 	environment.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/error/CMakeLists.txt
+++ b/winpr/libwinpr/error/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_ERROR")
 set(${MODULE_PREFIX}_SRCS
 	error.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/file/CMakeLists.txt
+++ b/winpr/libwinpr/file/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_FILE")
 set(${MODULE_PREFIX}_SRCS
 	file.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	if(NOT WIN32)
--- a/winpr/libwinpr/handle/CMakeLists.txt
+++ b/winpr/libwinpr/handle/CMakeLists.txt
@ -25,11 +25,11 @@ set(${MODULE_PREFIX}_SRCS
 	handle.c
 	table.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -45,7 +45,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
 	set(WINPR_SYNCH_LIBS ${WINPR_SYNCH_LIBS} rt)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
--- a/winpr/libwinpr/heap/CMakeLists.txt
+++ b/winpr/libwinpr/heap/CMakeLists.txt
@ -21,11 +21,11 @@ set(MODULE_PREFIX "WINPR_HEAP")
 set(${MODULE_PREFIX}_SRCS
 	heap.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -33,7 +33,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/interlocked/CMakeLists.txt
+++ b/winpr/libwinpr/interlocked/CMakeLists.txt
@ -21,11 +21,11 @@ set(MODULE_PREFIX "WINPR_INTERLOCKED")
 set(${MODULE_PREFIX}_SRCS
 	interlocked.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -33,7 +33,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	target_link_libraries(${MODULE_NAME} winpr-crt winpr-handle winpr-synch)
--- a/winpr/libwinpr/io/CMakeLists.txt
+++ b/winpr/libwinpr/io/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_IO")
 set(${MODULE_PREFIX}_SRCS
 	io.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/library/CMakeLists.txt
+++ b/winpr/libwinpr/library/CMakeLists.txt
@ -21,11 +21,11 @@ set(MODULE_PREFIX "WINPR_LIBRARY")
 set(${MODULE_PREFIX}_SRCS
 	library.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -33,7 +33,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	if(NOT WIN32)
--- a/winpr/libwinpr/path/CMakeLists.txt
+++ b/winpr/libwinpr/path/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_PATH")
 set(${MODULE_PREFIX}_SRCS
 	path.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	target_link_libraries(${MODULE_NAME} winpr-crt winpr-heap)
--- a/winpr/libwinpr/pipe/CMakeLists.txt
+++ b/winpr/libwinpr/pipe/CMakeLists.txt
@ -21,11 +21,11 @@ set(MODULE_PREFIX "WINPR_PIPE")
 set(${MODULE_PREFIX}_SRCS
 	pipe.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -33,7 +33,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	target_link_libraries(${MODULE_NAME} winpr-crt winpr-file winpr-handle)
--- a/winpr/libwinpr/registry/CMakeLists.txt
+++ b/winpr/libwinpr/registry/CMakeLists.txt
@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS
 	registry_reg.h
 	registry.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -31,7 +31,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	target_link_libraries(${MODULE_NAME} winpr-utils)
--- a/winpr/libwinpr/rpc/CMakeLists.txt
+++ b/winpr/libwinpr/rpc/CMakeLists.txt
@ -41,7 +41,7 @@ set(${MODULE_PREFIX}_SRCS
 	ndr_union.h
 	midl.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -61,7 +61,7 @@ else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${ZLIB_LIBRARIES})
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
--- a/winpr/libwinpr/sspi/CMakeLists.txt
+++ b/winpr/libwinpr/sspi/CMakeLists.txt
@ -53,7 +53,7 @@ if(NOT WITH_NATIVE_SSPI)
 		${${MODULE_PREFIX}_SRCS})
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${WINPR_SSPI_SRCS})
 else()
 	add_library(${MODULE_NAME} ${WINPR_SSPI_SRCS})
@ -74,7 +74,7 @@ else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${ZLIB_LIBRARIES})
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 else()
 	if (NOT WIN32)
@ -87,7 +87,7 @@ else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr-utils)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
--- a/winpr/libwinpr/sspicli/CMakeLists.txt
+++ b/winpr/libwinpr/sspicli/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_SSPICLI")
 set(${MODULE_PREFIX}_SRCS
 	sspicli.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/synch/CMakeLists.txt
+++ b/winpr/libwinpr/synch/CMakeLists.txt
@ -37,11 +37,11 @@ set(${MODULE_PREFIX}_SRCS
 	timer.c
 	wait.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -57,7 +57,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
 	set(WINPR_SYNCH_LIBS ${WINPR_SYNCH_LIBS} rt)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr-handle)
--- a/winpr/libwinpr/sysinfo/CMakeLists.txt
+++ b/winpr/libwinpr/sysinfo/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_SYSINFO")
 set(${MODULE_PREFIX}_SRCS
 	sysinfo.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/thread/CMakeLists.txt
+++ b/winpr/libwinpr/thread/CMakeLists.txt
@ -27,11 +27,11 @@ set(${MODULE_PREFIX}_SRCS
 	thread.c
 	tls.c)

-if(MSVC AND (NOT WITH_MONOLITHIC_BUILD))
+if(MSVC AND (NOT MONOLITHIC_BUILD))
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -47,7 +47,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} rt)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr-handle)
--- a/winpr/libwinpr/timezone/CMakeLists.txt
+++ b/winpr/libwinpr/timezone/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_TIMEZONE")
 set(${MODULE_PREFIX}_SRCS
 	timezone.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/utils/CMakeLists.txt
+++ b/winpr/libwinpr/utils/CMakeLists.txt
@ -27,7 +27,7 @@ set(${MODULE_PREFIX}_SRCS
 include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(${OPENSSL_INCLUDE_DIR})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -39,7 +39,7 @@ set(${MODULE_PREFIX}_LIBS
 	${ZLIB_LIBRARIES}
 	${OPENSSL_LIBRARIES})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	if (NOT WIN32)
--- a/winpr/libwinpr/winhttp/CMakeLists.txt
+++ b/winpr/libwinpr/winhttp/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_WINHTTP")
 set(${MODULE_PREFIX}_SRCS
 	winhttp.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -29,7 +29,7 @@ endif()

 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)

 else()
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/winpr/libwinpr/winsock/CMakeLists.txt
+++ b/winpr/libwinpr/winsock/CMakeLists.txt
@ -21,7 +21,7 @@ set(MODULE_PREFIX "WINPR_WINSOCK")
 set(${MODULE_PREFIX}_SRCS
 	winsock.c)

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	add_library(${MODULE_NAME} OBJECT ${${MODULE_PREFIX}_SRCS})
 else()
 	add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
@ -33,7 +33,7 @@ if(WIN32)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ws2_32)
 endif()

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	set(WINPR_LIBS ${WINPR_LIBS} ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)
 else()
 	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
--- a/winpr/tools/hash/CMakeLists.txt
+++ b/winpr/tools/hash/CMakeLists.txt
@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS

 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

-if(WITH_MONOLITHIC_BUILD)
+if(MONOLITHIC_BUILD)
 	target_link_libraries(${MODULE_NAME} winpr)
 else()
 	target_link_libraries(${MODULE_NAME} winpr-utils)