Changeset 2477

Show
Ignore:
Timestamp:
04/03/08 19:42:59 (9 months ago)
Author:
edmanm
Message:

Apparently we need to say "FORCE" to convince CMake that we really do want a
fat binary.

Location:
vidalia/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • vidalia/trunk/CHANGELOG

    r2467 r2477  
    110.1.3   xx-xxx-2008 
     2  o Fix the OSX_FAT_BINARY build option so that it actually does produce a 
     3    Universal binary when enabled. (Ticket #342) 
    24  o Correct the tab order on the custom bandwidth settings tab. (Ticket #351) 
    3  
     5  
    46 
    570.1.2   24-Mar-2008 

  • vidalia/trunk/CMakeLists.txt

    r2476 r2477  
    4646if (APPLE) 
    4747  option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF) 
     48  if (OSX_FAT_BINARY) 
     49    set(CMAKE_OSX_ARCHITECTURES "ppc;i386"  
     50        CACHE STRING "OS X build architectures" FORCE) 
     51  endif(OSX_FAT_BINARY) 
    4852endif(APPLE) 
    4953 

  • vidalia/trunk/src/CMakeLists.txt

    r2362 r2477  
    2323) 
    2424 
    25 if (APPLE) 
    26   if (OSX_FAT_BINARY) 
    27     ## Set the appropriate flags for building a Universal binary 
    28     set(CMAKE_OSX_ARCHITECTURES ppc i386) 
    29   endif(OSX_FAT_BINARY) 
    30 endif(APPLE) 
    31  
    3225if(MSVC) 
    3326  add_definitions(-D_USE_MATH_DEFINES=1)