equal
deleted
inserted
replaced
69 set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") |
69 set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") |
70 |
70 |
71 |
71 |
72 #create universal binaries only when it's time to bundle the application, also build server |
72 #create universal binaries only when it's time to bundle the application, also build server |
73 IF(BUNDLE) |
73 IF(BUNDLE) |
74 set(WITH_SERVER false) |
74 set(WITH_SERVER true) |
75 if(NOT minimum_macosx MATCHES "10.6") |
75 if(NOT minimum_macosx MATCHES "10.6") |
76 set(CMAKE_C_COMPILER "gcc-4.0") |
76 set(CMAKE_C_COMPILER "gcc-4.0") |
77 set(CMAKE_CXX_COMPILER "g++-4.0") |
77 set(CMAKE_CXX_COMPILER "g++-4.0") |
|
78 else() |
|
79 if(current_macosx_version MATCHES "10.6") |
|
80 set(CMAKE_OSX_ARCHITECTURES "x86_64") |
|
81 endif() |
78 endif() |
82 endif() |
79 ELSE() |
83 ELSE() |
80 if(current_macosx_version MATCHES "10.6") |
84 if(current_macosx_version MATCHES "10.6") |
81 set(CMAKE_OSX_ARCHITECTURES "x86_64") |
85 set(CMAKE_OSX_ARCHITECTURES "x86_64") |
82 endif() |
86 endif() |