equal
deleted
inserted
replaced
42 |
42 |
43 #create universal binaries only when it's time to bundle the application |
43 #create universal binaries only when it's time to bundle the application |
44 IF(BUNDLE) |
44 IF(BUNDLE) |
45 if(current_macosx_version MATCHES "10.6") |
45 if(current_macosx_version MATCHES "10.6") |
46 set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400") |
46 set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400") |
47 set(build_64_universal TRUE) |
47 set(build_x86_64 TRUE) |
|
48 set(build_i386 TRUE) |
|
49 set(build_ppc TRUE) |
48 else() |
50 else() |
49 set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") |
51 set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") |
|
52 set(build_i386 TRUE) |
|
53 set(build_ppc TRUE) |
50 endif() |
54 endif() |
|
55 ELSE() |
|
56 set(build_i386 TRUE) |
51 ENDIF() |
57 ENDIF() |
52 |
58 |
53 message(STATUS "Target system: Mac OS X ${minimum_macosx} for ${CMAKE_OSX_ARCHITECTURES}") |
59 message(STATUS "Target system: Mac OS X ${minimum_macosx} for ${CMAKE_OSX_ARCHITECTURES}") |
54 |
60 |
55 if(minimum_macosx MATCHES "10.4") |
61 if(minimum_macosx MATCHES "10.4") |