From 8d0ec989d16761d72a4f9412411fbcd1fae89332 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Mon, 21 Jun 2010 06:38:38 +0000
Subject: [PATCH] Merge 1.3.6 r648:652 into trunk

---
 cmake/CMakeLists_config.txt | 12 ++++++++++++
 cmake/CMakeLists_cpack.txt  |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/cmake/CMakeLists_config.txt b/cmake/CMakeLists_config.txt
index a29a5645..4254fb86 100644
--- a/cmake/CMakeLists_config.txt
+++ b/cmake/CMakeLists_config.txt
@@ -97,6 +97,18 @@ IF(UNIX)
 	
 	IF(APPLE)
 
+		# build mac os x universal
+		set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
+			CACHE STRING "Build architectures for OSX" FORCE)
+
+		# TODO: fix 64-bit failures
+		#set(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64"
+		#	CACHE STRING "Build architectures for OSX" FORCE)
+
+		# not sure this is a good idea
+		#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5" 
+		#	CACHE STRING "Flags used by the compiler during all build types." FORCE)
+
 		FIND_LIBRARY(lib_ScreenSaver ScreenSaver)
 		FIND_LIBRARY(lib_IOKit IOKit)
 		FIND_LIBRARY(lib_ApplicationServices ApplicationServices)
diff --git a/cmake/CMakeLists_cpack.txt b/cmake/CMakeLists_cpack.txt
index cf73edbc..1cf63781 100644
--- a/cmake/CMakeLists_cpack.txt
+++ b/cmake/CMakeLists_cpack.txt
@@ -74,7 +74,11 @@ IF(UNIX)
 	SET(CPACK_SOURCE_GENERATOR TGZ)
 ELSE(UNIX)
 	SET(CPACK_SOURCE_GENERATOR ZIP)
-ENDIF(UNIX)
+ENDIF(UNIX)
+
+if(APPLE)
+    set(CPACK_SYSTEM_NAME "MacOSX-Universal")
+endif(APPLE)
 
 SET(CPACK_PACKAGE_NAME "synergy-plus")
 SET(CPACK_PACKAGE_VENDOR "The Synergy+ Project")