[vidalia-svn] r2477: Apparently we need to say "FORCE" to convince CMake that we (in vidalia/trunk: . src)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-04-03 19:42:59 -0400 (Thu, 03 Apr 2008)
New Revision: 2477

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/src/CMakeLists.txt
Log:
Apparently we need to say "FORCE" to convince CMake that we really do want a
fat binary.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2008-04-02 02:00:36 UTC (rev 2476)
+++ vidalia/trunk/CHANGELOG	2008-04-03 23:42:59 UTC (rev 2477)
@@ -1,7 +1,9 @@
 0.1.3   xx-xxx-2008
+  o Fix the OSX_FAT_BINARY build option so that it actually does produce a
+    Universal binary when enabled. (Ticket #342)
   o Correct the tab order on the custom bandwidth settings tab. (Ticket #351)
+ 
 
-
 0.1.2   24-Mar-2008
   o Correctly load the CA certificate used to verify SSL connections to the
     GeoIP server. This caused Vidalia >= 0.1.0 clients built against Qt >=

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2008-04-02 02:00:36 UTC (rev 2476)
+++ vidalia/trunk/CMakeLists.txt	2008-04-03 23:42:59 UTC (rev 2477)
@@ -45,6 +45,10 @@
 ## Define Vidalia-specific CMake options
 if (APPLE)
   option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF)
+  if (OSX_FAT_BINARY)
+    set(CMAKE_OSX_ARCHITECTURES "ppc;i386" 
+        CACHE STRING "OS X build architectures" FORCE)
+  endif(OSX_FAT_BINARY)
 endif(APPLE)
 
 ## Check for QSslSocket

Modified: vidalia/trunk/src/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/CMakeLists.txt	2008-04-02 02:00:36 UTC (rev 2476)
+++ vidalia/trunk/src/CMakeLists.txt	2008-04-03 23:42:59 UTC (rev 2477)
@@ -22,13 +22,6 @@
   ${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)
-
 if(MSVC)
   add_definitions(-D_USE_MATH_DEFINES=1)
 endif(MSVC)