cmake: update cmake client scripts for monolithic build

client/DirectFB/CMakeLists.txt

@@ -19,7 +19,7 @@
 
 include_directories(${DIRECTFB_INCLUDE_DIRS})
 
-add_executable(dfreerdp
+set(FREERDP_CLIENT_DIRECTFB_SRCS
 	df_event.c
 	df_event.h
 	df_graphics.c
@@ -27,11 +27,20 @@ add_executable(dfreerdp
 	dfreerdp.c
 	dfreerdp.h)
 
-target_link_libraries(dfreerdp freerdp-core)
-target_link_libraries(dfreerdp freerdp-gdi)
-target_link_libraries(dfreerdp freerdp-locale)
-target_link_libraries(dfreerdp freerdp-channels)
-target_link_libraries(dfreerdp freerdp-utils)
-target_link_libraries(dfreerdp ${DIRECTFB_LIBRARIES})
+add_executable(dfreerdp ${FREERDP_CLIENT_DIRECTFB_SRCS})
 
+set(FREERDP_CLIENT_DIRECTFB_LIBS ${DIRECTFB_LIBRARIES})
+
+if(WITH_MONOLITHIC_BUILD)
+	set(FREERDP_CLIENT_DIRECTFB_LIBS ${FREERDP_CLIENT_DIRECTFB_LIBS} freerdp)
+else()
+	set(FREERDP_CLIENT_DIRECTFB_LIBS ${FREERDP_CLIENT_DIRECTFB_LIBS}
+		freerdp-core
+		freerdp-gdi
+		freerdp-locale
+		freerdp-channels
+		freerdp-utils)
+endif()
+
+target_link_libraries(dfreerdp ${FREERDP_CLIENT_DIRECTFB_LIBS})
 install(TARGETS dfreerdp DESTINATION ${CMAKE_INSTALL_BINDIR})

client/Windows/CMakeLists.txt

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_executable(wfreerdp WIN32
+set(FREERDP_CLIENT_WINDOWS_SRCS
 	wf_gdi.c
 	wf_gdi.h
 	wf_event.c
@@ -33,10 +33,18 @@ add_executable(wfreerdp WIN32
 	wfreerdp.c
 	wfreerdp.h)
 
-target_link_libraries(wfreerdp freerdp-core)
-target_link_libraries(wfreerdp freerdp-gdi)
-target_link_libraries(wfreerdp freerdp-utils)
-target_link_libraries(wfreerdp freerdp-codec)
-target_link_libraries(wfreerdp freerdp-channels)
+add_executable(wfreerdp WIN32 ${FREERDP_CLIENT_WINDOWS_SRCS})
 
+if(WITH_MONOLITHIC_BUILD)
+	set(FREERDP_CLIENT_WINDOWS_LIBS ${FREERDP_CLIENT_X11_LIBS} freerdp)
+else()
+	set(FREERDP_CLIENT_WINDOWS_LIBS ${FREERDP_CLIENT_X11_LIBS}
+		freerdp-core
+		freerdp-gdi
+		freerdp-codec
+		freerdp-channels
+		freerdp-utils)
+endif()
+
+target_link_libraries(wfreerdp ${FREERDP_CLIENT_X11_LIBS})
 install(TARGETS wfreerdp DESTINATION ${CMAKE_INSTALL_BINDIR})

client/X11/CMakeLists.txt

@@ -20,7 +20,7 @@
 include(FindXmlto)
 include_directories(${X11_INCLUDE_DIRS})
 
-add_executable(xfreerdp
+set(FREERDP_CLIENT_X11_SRCS
 	xf_gdi.c
 	xf_gdi.h
 	xf_rail.c
@@ -42,6 +42,12 @@ add_executable(xfreerdp
 	xfreerdp.c
 	xfreerdp.h)
 
+add_executable(xfreerdp ${FREERDP_CLIENT_X11_SRCS})
+
+set(FREERDP_CLIENT_X11_LIBS
+	${X11_LIBRARIES}
+	${CMAKE_DL_LIBS})
+
 if(WITH_MANPAGES)
 	if(XMLTO_FOUND)
 		add_custom_command(OUTPUT xfreerdp.1
@@ -61,38 +67,43 @@ find_suggested_package(Xinerama)
 if(WITH_XINERAMA)
 	add_definitions(-DWITH_XINERAMA -DWITH_XEXT)
 	include_directories(${XINERAMA_INCLUDE_DIRS})
-	target_link_libraries(xfreerdp ${XINERAMA_LIBRARIES})
+	set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XINERAMA_LIBRARIES})
 endif()
 
 find_suggested_package(Xext)
 if(WITH_XEXT)
 	add_definitions(-DWITH_XEXT)
 	include_directories(${XEXT_INCLUDE_DIRS})
-	target_link_libraries(xfreerdp ${XEXT_LIBRARIES})
+	set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XEXT_LIBRARIES})
 endif()
 
 find_suggested_package(Xcursor)
 if(WITH_XCURSOR)
 	add_definitions(-DWITH_XCURSOR)
 	include_directories(${XCURSOR_INCLUDE_DIRS})
-	target_link_libraries(xfreerdp ${XCURSOR_LIBRARIES})
+	set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XCURSOR_LIBRARIES})
 endif()
 
 find_suggested_package(Xv)
 if(WITH_XV)
 	add_definitions(-DWITH_XV)
 	include_directories(${XV_INCLUDE_DIRS})
-	target_link_libraries(xfreerdp ${XV_LIBRARIES})
+	set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XV_LIBRARIES})
 endif()
 
 include_directories(${CMAKE_SOURCE_DIR}/resources)
 
-target_link_libraries(xfreerdp freerdp-core)
-target_link_libraries(xfreerdp freerdp-gdi)
-target_link_libraries(xfreerdp freerdp-locale)
-target_link_libraries(xfreerdp freerdp-rail)
-target_link_libraries(xfreerdp freerdp-channels)
-target_link_libraries(xfreerdp freerdp-utils)
-target_link_libraries(xfreerdp ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
+if(WITH_MONOLITHIC_BUILD)
+	set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} freerdp)
+else()
+	set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS}
+		freerdp-core
+		freerdp-gdi
+		freerdp-locale
+		freerdp-rail
+		freerdp-channels
+		freerdp-utils)
+endif()
 
+target_link_libraries(xfreerdp ${FREERDP_CLIENT_X11_LIBS})
 install(TARGETS xfreerdp DESTINATION ${CMAKE_INSTALL_BINDIR})

client/test/CMakeLists.txt

@@ -17,11 +17,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_executable(freerdp-test
+set(FREERDP_CLIENT_TEST_SRCS
 	freerdp.c)
 
-target_link_libraries(freerdp-test freerdp-core)
-target_link_libraries(freerdp-test freerdp-gdi)
-target_link_libraries(freerdp-test freerdp-utils)
-target_link_libraries(freerdp-test freerdp-channels ${CMAKE_DL_LIBS})
+add_executable(freerdp-test ${FREERDP_CLIENT_TEST_SRCS})
 
+set(FREERDP_CLIENT_TEST_LIBS ${FREERDP_CLIENT_TEST_LIBS} ${CMAKE_DL_LIBS})
+
+if(WITH_MONOLITHIC_BUILD)
+	set(FREERDP_CLIENT_TEST_LIBS ${FREERDP_CLIENT_TEST_LIBS} freerdp)
+else()
+	set(FREERDP_CLIENT_TEST_LIBS ${FREERDP_CLIENT_TEST_LIBS}
+		freerdp-core
+		freerdp-gdi
+		freerdp-utils
+		freerdp-channels)
+endif()
+
+target_link_libraries(freerdp-test ${FREERDP_CLIENT_TEST_LIBS})

cmake/ConfigOptions.cmake

@@ -14,7 +14,7 @@ if(MSVC)
 	option(WITH_NATIVE_SSPI "Use native SSPI modules" ON)
 endif()
 
-if(${CMAKE_VERSION} VERSION_GREATER 2.8.7)
+if(${CMAKE_VERSION} VERSION_GREATER 2.8.8)
 	option(WITH_MONOLITHIC_BUILD "Use monolithic build" OFF)
 endif()