[vidalia-svn] r4081: Add an OSX_FORCE_32BIT CMake option that can be used to forc (vidalia/trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-08-28 18:44:50 -0400 (Fri, 28 Aug 2009)
New Revision: 4081

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/INSTALL
Log:

Add an OSX_FORCE_32BIT CMake option that can be used to force a 32-bit
build on Mac OS X versions that default to 64-bit builds (e.g., Snow
Leopard), if only 32-bit versions of the Qt libraries are available. Also
clean up some formatting in the INSTALL file.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2009-08-28 18:14:48 UTC (rev 4080)
+++ vidalia/trunk/CHANGELOG	2009-08-28 22:44:50 UTC (rev 4081)
@@ -2,6 +2,9 @@
   o Apply an application-global stylesheet on OS X that forces all tree
     widgets in Vidalia to use the 12pt font recommended by Apple's human
     interface guidelines.
+  o Add an OSX_FORCE_32BIT CMake option that can be used to force a 32-bit
+    build on Mac OS X versions that default to 64-bit builds (e.g., Snow
+    Leopard), if only 32-bit versions of the Qt libraries are available.
 
 
 0.2.3   27-Aug-2009

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2009-08-28 18:14:48 UTC (rev 4080)
+++ vidalia/trunk/CMakeLists.txt	2009-08-28 22:44:50 UTC (rev 4081)
@@ -73,6 +73,13 @@
     set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk"
         CACHE STRING "isysroot used for universal binary support" FORCE)
   endif(OSX_FAT_BINARY)
+
+  option(OSX_FORCE_32BIT "Force a 32-bit build for compatibility." OFF)
+  if (OSX_FORCE_32BIT)
+    add_definitions(-m32)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" 
+        CACHE STRING "Flags used by the linker." FORCE)
+  endif(OSX_FORCE_32BIT)
 endif(APPLE)
 
 ## UPnP support is currently optional (enabled by default)

Modified: vidalia/trunk/INSTALL
===================================================================
--- vidalia/trunk/INSTALL	2009-08-28 18:14:48 UTC (rev 4080)
+++ vidalia/trunk/INSTALL	2009-08-28 22:44:50 UTC (rev 4081)
@@ -179,33 +179,50 @@
 `cmake` commands above. Each of the configuration options can be specified on
 the command line and follows the format "-D <var>:<type>=<value>
 
-  -DUSE_QSSLSOCKET=0                      Disable building Vidalia with SSL
-                                          support.
+  -DUSE_QSSLSOCKET=0 
+  
+      Disable building Vidalia with SSL support.
 
-  -DUSE_MINIUPNPC=0                       Disable UPnP support in Vidalia.
+  -DUSE_MINIUPNPC=0
+    
+    Disable UPnP support in Vidalia.
 
-  -DOSX_FAT_BINARY=1                      Build Vidalia as a Universal binary.
+  -DOSX_FAT_BINARY=1 
+    
+    Build Vidalia as a Universal binary.
 
-  -DQT_QMAKE_EXECUTABLE=/path/to/qmake    Specifies the location of Qt's
-                                          'qmake' binary.
+  -DOSX_FORCE_32BIT=1
 
-  -DOPENSSL_LIBRARY_DIR=/path/to/openssl  Specifies the location of OpenSSL's
-                                          libraries.
+    Forces a 32-bit build. This is useful on platforms that default to 64-bit
+    (e.g. Snow Leopard), but only have 32-bit versions of the Qt libraries
+    available.
 
-  -DCMAKE_INSTALL_PREFIX=/usr/local       Specifies the install prefix used
-                                          for `make install`.
+  -DQT_QMAKE_EXECUTABLE=/path/to/qmake
+  
+    Specifies the location of Qt's 'qmake' binary.
 
-  -DCMAKE_BUILD_TYPE=<buildtype>          Available build types include:
-                                            "release", "debug", "minsizerel"
-  -DUSE_MARBLE=1                          Replace the flat map with a
-                                          3-D sphere using the Marble libraries.
+  -DOPENSSL_LIBRARY_DIR=/path/to/openssl
+  
+    Specifies the location of OpenSSL's libraries.
 
-  -DWIX_BINARY_DIR=C:\Path\To\WiX\        Specifies the location of your
-                                          WiX executables, such as
-                                          candle.exe and light.exe
-                                          (optional, Windows-only).
+  -DCMAKE_INSTALL_PREFIX=/usr/local
+  
+    Specifies the install prefix used for `make install`.
 
+  -DCMAKE_BUILD_TYPE=<buildtype>
+  
+    Available build types include: "release", "debug", "minsizerel"
 
+  -DUSE_MARBLE=1
+  
+    Replace the flat map with a 3-D sphere using the Marble libraries.
+
+  -DWIX_BINARY_DIR=C:\Path\To\WiX\
+  
+    Specifies the location of your WiX executables, such as candle.exe and
+    light.exe (optional, Windows-only).
+
+
 For example, to configure CMake to look for Qt in "/usr/local/Qt-4.3.2/bin",
 you would run: