From 000abf7ca757c050083ed8a64750c6b9cd41134c Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Tue, 21 Mar 2017 13:33:55 +0000 Subject: [PATCH] Change build scripts to be compatible with Qt 5.8 on Mac OS X This change obseletes Mac OS X 10.7 and 10.8 which are not supported by Qt 5.8. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7613 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 15 +++++---------- Darwin/developer read me.txt | 10 ++-------- Darwin/wsjtx_DMG.DS_Store | Bin 15364 -> 12292 bytes 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cee0269ea..8580e2169 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,27 +3,22 @@ cmake_minimum_required (VERSION 2.8.10 FATAL_ERROR) if (APPLE) # # The following variables define the portability and compatability attributes of the Mac OS X build - # they are choosen with care and should not be changed without good cause. Note that they preclude - # doing a default build on OS X 10.7 since there is no 10.9 SDK available for Mac OS X 10.7. This doesn't - # preclude builds on newer versions of OS X being installed on Mac OS X 10.7, in fact it is exacty these - # options that ensure offcial build run on 10.7 and newer versions of Mac OS X. At some point it may - # be that some new version cannot be supported as well as 10.7, at that point the deployment target below - # must be moved on to 10.8 and we can no longer support Mac OS X 10.7. + # they are choosen with care and should not be changed without good cause. # # Among other things these options are chosen to match the portability and compatability options of the # Qt framework dylibs which can be checked as follows: # # otool -l | grep -A3 LC_VERSION_MIN_MACOSX # - set (CMAKE_OSX_DEPLOYMENT_TARGET 10.7 + set (CMAKE_OSX_DEPLOYMENT_TARGET 10.9 CACHE STRING "Earliest version of OS X supported -Earliest version we can support with C++11 & libc++ is 10.7. +Earliest version we can support with Qt 5.8, C++11 & libc++ is 10.9. Do not override this if you intend to build an official deployable installer.") - set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk + set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk CACHE STRING "Mac OS X SDK to build with -Change this to the newest SDK available that you can install on your system (10.9 preferred). +Change this to the newest SDK available that you can install on your system (10.11 preferred). Do not override this if you intend to build an official deployable installer.") endif (APPLE) diff --git a/Darwin/developer read me.txt b/Darwin/developer read me.txt index 9c472db98..a7615f53f 100644 --- a/Darwin/developer read me.txt +++ b/Darwin/developer read me.txt @@ -36,9 +36,6 @@ hdiutil resize -sectors 110000 rw.dmg # now you can mount the R/W DMG hdiutil attach rw.dmg -# change the hidden attribute on the background PNG -chflags nohidden /Volumes/WSJT-X/background.png - # make the .DS_Store file writeable chmod 644 /Volumes/WSJT-X/.DS_Store @@ -48,11 +45,8 @@ chmod 644 /Volumes/WSJT-X/.DS_Store # to the DMG root folder, you need to have changed the install steps before doing this # procedure so the content changes are reflected in the installer DMG you start with. -# when you are happy with the layout etc. close the Finder window to ensure all -# changes are saved. - -# set the background PNG as a hidden file -chflags hidden /Volumes/WSJT-X/background.png +# when you are happy with the layout etc. move the Finder window by any amount, this +# ensures that the .DS_Store file is updated from Finder's cache. # make the .DS_Store file read only chmod 444 /Volumes/WSJT-X/.DS_Store diff --git a/Darwin/wsjtx_DMG.DS_Store b/Darwin/wsjtx_DMG.DS_Store index 6c324f13b453ff4401049e1b80c5565821cb76f1..e062a52811220283fa60d76af5ea902e6d56a009 100644 GIT binary patch literal 12292 zcmeHNU2Ggz6+Yvv6FYXCv7Mw&)1ndSL!xHAv)&)CZA8}VwMn8x4zcCfG{u?Sopq)e z&nz?JwcTLJh^j)UNCe#$C;- zle_rs?+eCLL02w@Q6~pFjqU&N@t1`P@ z(--A^jm1vbrtN&h(RJ&&CC8{tSF5h>%`eJ(-Lhkw=2_b{f_|cBWP!*6kEsR39n;bB zd;gePBU*N3fye^Q7U26q0W!@Cx*1Ua>cE3tNUjh466R$gQv}Tmx*1Sk743Xg&_GoZ zA%+yFL#}Xh(7d3V0S(lBN0bGU7+De#isX+Dxq?c7l=n&Wh%69U;64^WypMN`W53Hm z?B4!v$+jl`G@;>5N#R4 z^68=N`|7^Dz3jD=S6a$9*B1Q#!a4B%ehA~823`P~z)u2S0XFUVTd#>ZH18$SV!qAJ zXl29lZ1<9Kq8QGTluw`N6*_GA@gMvmtDzk3XSO&sGMP<{$5X>o>3C`~Hx(ZlDNMvi z3PZ(WCaF%Tg=Dy&pW<uURrT~xrCd&qXz8I` zcDOP!tYyGttLj#^Kvh1KJhXDr^t__k!;QzfZK`T+H8v zoO3aJpD-v2QC{#W_y^@*Owop??C;O^m!2*{&TFFExU+CJ_+4yM{_}H0*Z%v?<81Me zg*>01eL#K}nb2T;#<5JB^I`shV~OjT9-1CY1OTX z4DX>*%`{w3RevM3?TEGS+||*!yQ_OoSC`z~)z$U<%q4qu#?!nNx1c$T@>4TLMK5X2 zd86W8n$@jIQ?KjRv~wDFlJgulp0#Zg4FX;(%^CVCGFlV1fW| zaDLCd(A@E&y#K7D*P(h=v-CN`HA;qQctV8}nXGh1PJaFa8keWWG zq%z5kW6G7`VfC1jPGvVXIsi{Udupz<{_+>U_1!mra^q(=fBwfm{h6&8Y`M>{ZJXgQ zC_KP`Er#!=ajN0ZBm<__$OE-uX!oRPmjgrdFQ4=k^vIia6o-jnH=QFL?JIN!bP#%L zWP!*6kp&_PL>72|TY!C7_xQGZn?df~ zz1_`wkee0wbpJ*Fj@>lj$0gHQ_;IOp!;j0V8yhk_xkE=Y<7XCX8=rmkYuCR1+Bd%W z=1+r-Vb9$MMA6&e21>AuQLYQ0H}$u%)-0+j0zI@WE+8B}j=;<0abLWsA0NwWem@DQNG{@1b zCB3lzys4FRbJ{A{o@Xy}OYRMe5+3>C-O=96VLiz z*Z21{78@jnTH5{##RKRsAGSkS23LBIi2gz;bv5Ut;Cds>=UJe>SMc0Jkh9*8`F}8& z{%DihD78$r2g#J4`$bc5!fSB$mylHILGt80&Cn?%QsQu_`{>X^|Ba!a_O_&$5aLO% z@;dOus=Aw#6)bLocaHz?6R<0c|MJStFj>=7|8KDiYd3G*p5(NN4}o1f6;TX{G|MSG zSo59Z-_{@$*7WrxB-t<%pa*nm=g?`i;Diuc_@m7W85LQEQ9_zwlti9k6d9{gdU&Q` zlx9aMTx*YSZwH~xAVR2Re+QnVZUj>t@fz3@55bX(utuR1NH_M;haWAyF&m~g`bkO< zpE$75<0Tbw57V}8iCMxUdr^d0&!{gQr5 zf2F%puXIQ{Dve3S*i>vfHXqYs<(L^;j@dCUwi5K#7T$53)@y=TJ&OMy*Z3dDK>YvE z5l+ZY;sr&b^M3#T*K}YaHnKouf&VuPNU`Efv4B;DKNGDBWH(6xUIa35yUl=Zses{x oGuPpF-lr;42FUV)ZU!_^`=9?4K=5HI`u*ok07Sq4k8l3}pQ_i0>Hq)$ literal 15364 zcmeHMO>7&-6@EigKa6FG`mw7zt;<9{Buz*z|HPGK#1thZR)E5WrP?y=L|QIaGUFAO z;F1y@N43xfx%6rjJ_SKx^jIa$rSK^S1GyBf4@FM~dI@@H3si>|=pktOz1>+#q*9|O zf}&{V2{Z4_%$xUSzL|M5OA(PMHp?lZ7!ma&F^>))`x4@IPDdytYq+04e{yUvh>6m+ zdqi7RCz#zkmQ=)}a35K3BOyKp~(IXd}S!A%?`fAo;G(z0iTo`vd?F zquL|LQ5L{sk{2Z3^*LHV!tV<1cNOvzL-^fMACr0o$#;G3cPAk~K7{lvq|GC?WIcDDjD@RJh@>snr_jkdo7oY#!a+%@-lotz9F@*R?3Z=tI_d0 zchdR%%dxDU-FZ27C!ftgo=orTu&?O7{*%uq&RtkG-r4!V-CchQLWTi4(KV$XqKqFP zD(04)K=^hrf!{}mf+<9vIX-Y=a40%FGCFqh)HlYzdHUJY-#)V%9W5E=t&KX*YR<8p zdeLrL*Nl4IsBT!r+bb2*sV-ICwytl~E9Iq{VOFXeD-EmF;L6qLNLTO6R{70?s^!}? z=!_jycphG>TUOPxcX55)wHhmjc{v2N?cqfEmSO*B8J05l<=qsblm4KmyT>$0XK0X0WROX>XoKqH zP?M@urUcc%H)sg$y>yk9=yh7AIIYkK4JEtnjH2#}V>dS~HyPkFCboE#$T8-~R>^6_ z9XH7-{l**2V%c9Q{C zqa>0(;SdZl5_Xg;N8w3H|1f|{T~ zpGj`Xox(GUw~lNk`UK|xft6$TAL11>1Rlog=Nvdw59D1>!ummeAmsw&ds3ztk;VrR z6p9hum#?WP`6o;kbfoRQOHlE9D_VAaVS96r7Rv3J(4<6$e+uDxw}tv zLHb3rkJ2q4rJg6ah;Hroa<_0)lf9qD{tiohP~b~Jo-dq6zZ{&iL0RrTlivLYWu7?C z_$(6kI)#rB-TlIcBPa(^B`A+Wk14Qm3Gy0J4T*Kw=(0RSuKD zJObOab{!+=w8K%0$H((b>FMHJYGE=ym(jBE%xqDQ>yxvu#^>g9`h03`KCfkSfltHp z+fRQv&;GrUv1xD4$Kd4yY#m+UQyt}xy2>ASmHXa*#nTV`KZ38{B7KJR zSEMko8ACc)uZb%h7lZNmqdCCpZ|D=uza8QZ>C@WXKXH58-Y;L8<)|5~+pFo!Y&M_M z*E((4{oM1lk0|I zrSiG;$(&(Mrgbf=X;Uf9)Xj1!ZJBvJZRqVVq;*A~v^HZpn+c;h;rBWqxvc2SO!N0zqwtv_KCAOC8Ron62 zdpsbnaT|66FXW0@kC-PQ6M^BMLKp~(IPzWdl6aoqXg@8gpA)pXY V2q**;0tx|zfI>ha@PCNFKLHv7)3yKr