[vidalia-svn] r3885: Backport r3884 to 0.1.x. (in vidalia/branches/vidalia-0.1: . pkg/osx)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-24 19:46:00 -0400 (Wed, 24 Jun 2009)
New Revision: 3885

Modified:
   vidalia/branches/vidalia-0.1/CMakeLists.txt
   vidalia/branches/vidalia-0.1/pkg/osx/build-bundle.txt
Log:

Backport r3884 to 0.1.x.


Modified: vidalia/branches/vidalia-0.1/CMakeLists.txt
===================================================================
--- vidalia/branches/vidalia-0.1/CMakeLists.txt	2009-06-24 23:38:31 UTC (rev 3884)
+++ vidalia/branches/vidalia-0.1/CMakeLists.txt	2009-06-24 23:46:00 UTC (rev 3885)
@@ -54,6 +54,8 @@
         CACHE STRING "OS X build architectures" FORCE)
     set(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4"
         CACHE STRING "Flags used by the linker." FORCE)
+    set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk"
+        CACHE STRING "isysroot used for universal binary support" FORCE)
   endif(OSX_FAT_BINARY)
 endif(APPLE)
 

Modified: vidalia/branches/vidalia-0.1/pkg/osx/build-bundle.txt
===================================================================
--- vidalia/branches/vidalia-0.1/pkg/osx/build-bundle.txt	2009-06-24 23:38:31 UTC (rev 3884)
+++ vidalia/branches/vidalia-0.1/pkg/osx/build-bundle.txt	2009-06-24 23:46:00 UTC (rev 3885)
@@ -55,7 +55,7 @@
 10. Configure Vidalia with the following:
 
       export MACOSX_DEPLOYMENT_TARGET=10.4
-      cmake -DOSX_FAT_BINARY=1 -DCMAKE_OSX_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk  . 
+      cmake -DOSX_FAT_BINARY=1  . 
 
    The Vidalia binary on OS X links to Qt statically, so you will need to have
    your Qt installation configured appropriately.