From 3adf0875caeb483056e42f83bb68bb8da8e5d37d Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Tue, 30 Aug 2011 20:38:05 +0200
Subject: [PATCH] inserted find_optional_package to require or ignore opional
 packages

---
 CMakeLists.txt                | 2 +-
 client/CMakeLists.txt         | 4 ++--
 client/X11/CMakeLists.txt     | 6 +++---
 libfreerdp-kbd/CMakeLists.txt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23068d831..6a93216e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,7 @@ if(APPLE)
 endif()
 
 # Build CUnit
-find_package(CUnit)
+find_optional_package(CUnit)
 if(CUNIT_FOUND)
    add_subdirectory(cunit)
    enable_testing()
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 97668b5c4..c97ad2a4e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -25,13 +25,13 @@ if(NOT WIN32)
 	add_subdirectory(test)
 
 	# Build X11 Client
-	find_package(X11)
+	find_optional_package(X11)
 	if(X11_FOUND)
 		add_subdirectory(X11)
 	endif()
 
 	# Build DirectFB Client
-	find_package(DirectFB)
+	find_optional_package(DirectFB)
 	if(DIRECTFB_FOUND)
 		add_subdirectory(DirectFB)
 	endif()
diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index 142283065..cbae05848 100644
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -44,21 +44,21 @@ if(WITH_MANPAGES)
 	install(FILES xfreerdp.1 DESTINATION share/man/man1)
 endif()
 
-find_package(Xinerama)
+find_optional_package(Xinerama)
 if(XINERAMA_FOUND)
 	add_definitions(-DWITH_XINERAMA -DWITH_XEXT)
 	include_directories(${XINERAMA_INCLUDE_DIRS})
 	target_link_libraries(xfreerdp ${XINERAMA_LIBRARIES})
 endif()
 
-find_package(Xext)
+find_optional_package(Xext)
 if(XEXT_FOUND)
 	add_definitions(-DWITH_XEXT)
 	include_directories(${XEXT_INCLUDE_DIRS})
 	target_link_libraries(xfreerdp ${XEXT_LIBRARIES})
 endif()
 
-find_package(Xcursor)
+find_optional_package(Xcursor)
 if(Xcursor_FOUND)
 	add_definitions(-DWITH_XCURSOR)
 	include_directories(${Xcursor_INCLUDE_DIRS})
diff --git a/libfreerdp-kbd/CMakeLists.txt b/libfreerdp-kbd/CMakeLists.txt
index cdb2e416b..2a07932d5 100644
--- a/libfreerdp-kbd/CMakeLists.txt
+++ b/libfreerdp-kbd/CMakeLists.txt
@@ -29,7 +29,7 @@ set(FREERDP_KBD_SRCS
 
 add_library(freerdp-kbd SHARED ${FREERDP_KBD_SRCS})
 
-find_package(XKBFile)
+find_optional_package(XKBFile)
 if(XKBFILE_FOUND)
 	add_definitions(-DWITH_XKBFILE)
 	include_directories(${XKBFILE_INCLUDE_DIRS})