[vidalia-svn] r2198: Add a OSX_FAT_BINARY option for building as a Universsal bin (in trunk: . pkg/osx src)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-07 17:52:14 -0500 (Fri, 07 Dec 2007)
New Revision: 2198

Modified:
   trunk/CMakeLists.txt
   trunk/INSTALL
   trunk/pkg/osx/build-bundle.txt
   trunk/src/CMakeLists.txt
Log:
Add a OSX_FAT_BINARY option for building as a Universsal binary.

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-12-07 21:37:21 UTC (rev 2197)
+++ trunk/CMakeLists.txt	2007-12-07 22:52:14 UTC (rev 2198)
@@ -39,6 +39,9 @@
 include(${QT_USE_FILE})
 include(VidaliaMacros.cmake)
 
+## Define Vidalia-specific CMake options
+option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF)
+
 ## Add the actual source directories
 add_subdirectory(src)
 add_subdirectory(doc)

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2007-12-07 21:37:21 UTC (rev 2197)
+++ trunk/INSTALL	2007-12-07 22:52:14 UTC (rev 2198)
@@ -107,6 +107,8 @@
 `cmake` commands above. Each of the configuration options can be specified on
 the command line and follows the format "-D <var>:<type>=<value>
 
+  -DOSX_FAT_BINARY=1                      Build Vidalia as a Universal binary
+
   -DQT_QMAKE_EXECUTABLE=/path/to/qmake    Specifies the location of Qt's
                                           'qmake' binary.
 

Modified: trunk/pkg/osx/build-bundle.txt
===================================================================
--- trunk/pkg/osx/build-bundle.txt	2007-12-07 21:37:21 UTC (rev 2197)
+++ trunk/pkg/osx/build-bundle.txt	2007-12-07 22:52:14 UTC (rev 2198)
@@ -49,7 +49,7 @@
 
 Vidalia
 10. Configure Vidalia with the following:
-    ./configure --disable-debug
+      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.

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2007-12-07 21:37:21 UTC (rev 2197)
+++ trunk/src/CMakeLists.txt	2007-12-07 22:52:14 UTC (rev 2198)
@@ -33,6 +33,13 @@
   ${CMAKE_CURRENT_BINARY_DIR}/util
 )
 
+if (APPLE)
+  if (OSX_FAT_BINARY)
+    ## Set the appropriate flags for building a Universal binary
+    set(CMAKE_OSX_ARCHITECTURES ppc i386)
+  endif(OSX_FAT_BINARY)
+endif(APPLE)
+
 add_subdirectory(torcontrol)
 add_subdirectory(util)
 add_subdirectory(vidalia)