From f2ea3bf935a87d0f1e824d68c9e0a77ece0b3f17 Mon Sep 17 00:00:00 2001
From: ksqsf <i@ksqsf.moe>
Date: Sat, 9 Nov 2024 19:23:36 +0100
Subject: [PATCH] build: add cmake support

---
 .github/workflows/cmake-ci.yml                |  17 ++++
 .../RimeIcon.appiconset/Contents.json         |  20 ++--
 .../{rime-128.png => icon-128x128.png}        | Bin
 .../{rime-256.png => icon-128x128@2.png}      | Bin
 .../{rime-16 1.png => icon-16x16.png}         | Bin
 .../{rime-32 1.png => icon-16x16@2.png}       | Bin
 .../RimeIcon.appiconset/icon-256x256.png      | Bin 0 -> 6452 bytes
 .../{rime-512.png => icon-256x256@2.png}      | Bin
 .../{rime-32.png => icon-32x32.png}           | Bin
 .../{rime-64.png => icon-32x32@2.png}         | Bin
 .../RimeIcon.appiconset/icon-512x512.png      | Bin 0 -> 11986 bytes
 .../{rime-1024.png => icon-512x512@2.png}     | Bin
 CMakeLists.txt                                |  95 ++++++++++++++++++
 INSTALL.md                                    |  17 ++++
 cmake/AddRime.cmake                           |  22 ++++
 cmake/AddSparkle.cmake                        |  18 ++++
 cmake/AppleUtils.cmake                        |  10 ++
 data/CMakeLists.txt                           |  21 ++++
 librime                                       |   2 +-
 package/CMakeLists.txt                        |  12 +++
 package/make_package                          |   9 +-
 resources/CMakeLists.txt                      |  31 ++++++
 22 files changed, 262 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/cmake-ci.yml
 rename Assets.xcassets/RimeIcon.appiconset/{rime-128.png => icon-128x128.png} (100%)
 rename Assets.xcassets/RimeIcon.appiconset/{rime-256.png => icon-128x128@2.png} (100%)
 rename Assets.xcassets/RimeIcon.appiconset/{rime-16 1.png => icon-16x16.png} (100%)
 rename Assets.xcassets/RimeIcon.appiconset/{rime-32 1.png => icon-16x16@2.png} (100%)
 create mode 100644 Assets.xcassets/RimeIcon.appiconset/icon-256x256.png
 rename Assets.xcassets/RimeIcon.appiconset/{rime-512.png => icon-256x256@2.png} (100%)
 rename Assets.xcassets/RimeIcon.appiconset/{rime-32.png => icon-32x32.png} (100%)
 rename Assets.xcassets/RimeIcon.appiconset/{rime-64.png => icon-32x32@2.png} (100%)
 create mode 100644 Assets.xcassets/RimeIcon.appiconset/icon-512x512.png
 rename Assets.xcassets/RimeIcon.appiconset/{rime-1024.png => icon-512x512@2.png} (100%)
 create mode 100644 CMakeLists.txt
 create mode 100644 cmake/AddRime.cmake
 create mode 100644 cmake/AddSparkle.cmake
 create mode 100644 cmake/AppleUtils.cmake
 create mode 100644 data/CMakeLists.txt
 create mode 100644 package/CMakeLists.txt
 create mode 100644 resources/CMakeLists.txt

diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml
new file mode 100644
index 000000000..f88130328
--- /dev/null
+++ b/.github/workflows/cmake-ci.yml
@@ -0,0 +1,17 @@
+name: cmake ci
+on: [workflow_dispatch]
+jobs:
+  build:
+    runs-on: macos-14
+    steps:
+      - name: Checkout last commit
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Configure build environment
+        run: |
+          brew install ninja rsync
+      - name: Build
+        run: |
+          cmake -S. -GNinja -DCMAKE_OSX_DEPLOYMENT_TARGET=13
+          ninja -Cbuild
diff --git a/Assets.xcassets/RimeIcon.appiconset/Contents.json b/Assets.xcassets/RimeIcon.appiconset/Contents.json
index acfdfc399..1553a9150 100644
--- a/Assets.xcassets/RimeIcon.appiconset/Contents.json
+++ b/Assets.xcassets/RimeIcon.appiconset/Contents.json
@@ -1,61 +1,61 @@
 {
   "images" : [
     {
-      "filename" : "rime-16 1.png",
+      "filename" : "icon-16x16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "rime-32 1.png",
+      "filename" : "icon-16x16@2.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "rime-32.png",
+      "filename" : "icon-32x32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "rime-64.png",
+      "filename" : "icon-32x32@2.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "rime-128.png",
+      "filename" : "icon-128x128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "rime-256.png",
+      "filename" : "icon-128x128@2.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "rime-256.png",
+      "filename" : "icon-256x256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "rime-512.png",
+      "filename" : "icon-256x256@2.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "rime-512.png",
+      "filename" : "icon-512x512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "rime-1024.png",
+      "filename" : "icon-512x512@2.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-128.png b/Assets.xcassets/RimeIcon.appiconset/icon-128x128.png
similarity index 100%
rename from Assets.xcassets/RimeIcon.appiconset/rime-128.png
rename to Assets.xcassets/RimeIcon.appiconset/icon-128x128.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-256.png b/Assets.xcassets/RimeIcon.appiconset/icon-128x128@2.png
similarity index 100%
rename from Assets.xcassets/RimeIcon.appiconset/rime-256.png
rename to Assets.xcassets/RimeIcon.appiconset/icon-128x128@2.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-16 1.png b/Assets.xcassets/RimeIcon.appiconset/icon-16x16.png
similarity index 100%
rename from Assets.xcassets/RimeIcon.appiconset/rime-16 1.png
rename to Assets.xcassets/RimeIcon.appiconset/icon-16x16.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-32 1.png b/Assets.xcassets/RimeIcon.appiconset/icon-16x16@2.png
similarity index 100%
rename from Assets.xcassets/RimeIcon.appiconset/rime-32 1.png
rename to Assets.xcassets/RimeIcon.appiconset/icon-16x16@2.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/icon-256x256.png b/Assets.xcassets/RimeIcon.appiconset/icon-256x256.png
new file mode 100644
index 0000000000000000000000000000000000000000..e12ead07c580610d62c28986b7d233b263ca1ccc
GIT binary patch
literal 6452
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

literal 0
HcmV?d00001

diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-512.png b/Assets.xcassets/RimeIcon.appiconset/icon-256x256@2.png
similarity index 100%
rename from Assets.xcassets/RimeIcon.appiconset/rime-512.png
rename to Assets.xcassets/RimeIcon.appiconset/icon-256x256@2.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-32.png b/Assets.xcassets/RimeIcon.appiconset/icon-32x32.png
similarity index 100%
rename from Assets.xcassets/RimeIcon.appiconset/rime-32.png
rename to Assets.xcassets/RimeIcon.appiconset/icon-32x32.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-64.png b/Assets.xcassets/RimeIcon.appiconset/icon-32x32@2.png
similarity index 100%
rename from Assets.xcassets/RimeIcon.appiconset/rime-64.png
rename to Assets.xcassets/RimeIcon.appiconset/icon-32x32@2.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/icon-512x512.png b/Assets.xcassets/RimeIcon.appiconset/icon-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c224363e9d43b25be471825a54467852d21ba9
GIT binary patch
literal 11986
zcmeHtcT|(xmN*tb>47Bl;)fzgOQ@kLlE_sl(tAll=p{(Nh+sqDBSCm?d@3RehAX0k
zk_$>y1VR!rUMc2^hzLr#7g15kLy@bXbHXk2=C|I=Z`Q2&b6BuAXP@29KKqot_g8wr
z*GpMJM?pqLMtSdd_y8H1^`N<4W|JKF_klkA8T{K!{VqIPMn+LX`nOJ|s#;4%My@tF
zD2x{7<Lyk&Ot&J&XObvZ^mHn~mXUGYNv9IYsT7(KiISL{;Re0G+YK2d$GbtH_C6RN
zswX8W`MbP>l)yaSAaY(R*(n~{>2BmocLog7DKw%HJv}WW+nMeLt?_jRZ7J9qGFn5S
zrMf{LQh`QcJ_n3EGY?XXoUAaGWDEvl<mhCDb;Ocw921Bn3nLqhjg2)1XN`5Rw6Srv
zwRg6|8vXtQ0f7hO6PyF^dwv%OdTvk>jYf60wmx*|kkuhutIUIm)>tPeCu@w2wT+D>
zz_83doIxYfEi<x>|KNb9WRnjjQ)$VW8Aei$L{erB%?$#|{x*wr>Yr>gvVXS}u$eWT
zNVUdVVWhKKLyRZ?iAT*jn6@T7o@`A?qoh+ZXxRW4`zJ0nDU+6&os{{Xu>N!SKL`NU
z_3`;r#y{01J^fD+*)&2fn8xo0`KQ>~L5Han>i|l2X3jw}g^&x>G?vbW>g;)tLZoFL
z49d(*`(v#R{Gqaujhz+7$kc~OPR@`{!t5VND0m``;s#0A%@PZK?SgD<o$YL$Z7`M?
zduI&hH&ma@_~eAc{}k2E*%tR7P=VjX6KTZ%FLFHDIU)04IuT4cIh~kDv8HAuLPmcY
z(%CaJE%P7{479Ud)56Ecd2dEGjhI2E?8Uo5VAfX2$??ukwphCaj2+q1(asTTX=jTg
zSvrv&94$#U4mS1_hXjf}+2Id*d?q<Zy0%jK-#k4&lMHzLyHsMlt(}uYf(;-i6D{p*
z>@b!%TO7qQ-Z38IWQ(CBkZ}oraPvEu3^p4v?H{>HwTcHE<Ku0J_D;4W%LHP4yrrFk
zgPkRbV(Vm?fN>()IFTIf>=W#y{=DWQ&fg_xgT*`i`wj`DWc}VsOEy~b3TGl&>g{e2
zS-Q-Wc<6U<@;|Z1e@pW3^oNotfa!m+_`gZd&P<>kA|9l8Bm&$0H{8qmKT|)OnEPKV
zZ-b4uC)r}-Eiq0QV73G&q9w@|<6!A%OTs$ZQb-s_oZTOj|EJ2^IosI%;g0_^<$pH~
zIf<B&NC79PHS|B9&VSE0f7A0nna;oOuK&&HSWC~%-~7z_|8>E&v41#Y!D6m~z`-qT
z{&{JD&Y#x~B?DOMAh=ZiMZxo_jLi1Yy?Box`ntEg&DAd`MC;dy3D5W1>@|wtc4Al9
z#vcRX{rwT`NzAi%WJY9Dq9an9?gh7ukavb6Zj9W@J=F1JY$PHw@=XA0d<TIXowY71
z?3CL2`0a1Dw#5%#$u`}**J!it;>B-YzPS5oYilFG&)Wbz_<4f_O|dfpG~0cp;HJR;
z10&DQy?(789C4h_L5N7$TeXw%-Xf!7agkS?NiM7vIl<L1$2@L`NfRn-2|U6|4X5MA
z3!mYG_w3m-Tnkr*O;nz6|3I`->0R&5hmiduH8gph!^|c<#!;jN0_$YKSF0ym9%X2c
zo{AI~`HY^l3@cs7?oD9#sokoL6>Kzx`UbaD774@PBAk*udEG40V0K!~n}87idXD=7
zswRC)^V&H=b{ipX8zC9L>zm-}KHwm9Ii7-bJD{ZrT7MsDMX6i>>6P-cHYQww;Z-au
zFl$r!(qwV#x<e$Vkjaek;)_`>A!H^j?~k8vR#l{`A4M~>Tzv(*y%7i>vr6Xe<?y?@
zef!4CYT~vvi#}y(I>5_28A*5D^-68CoXdsUI6VTMR%M`9%%?U-Hwjg#`WeE2@#4p<
z97fVbSscnwAfdaWnXp48vxYx(`$a;&#?Br`iSkNNPzyXZz|*GN7%<x&Zih(2-qj_G
zWn(7{r&7Zhsno^>Uxd9gN^??-Q*FcJ=Pzbdmz|LW%=a8>MTSo6jv6_~AnfOaWGZ%$
zZ%n|Koz8I8spxBLMc4GbT##iW^smFdxeiu+ZPa!cmN;r!3luq<zm@yV>>D?B-h;R_
zi(j#^>bnj>RoQA*ylr7jzez)hA?YV`mIg8k)|`9=K_)e~m+e<{x=tVKEy?Pr{2QaP
zUq!@RAnBPyEL&HFir$M0essewW0SLxN!=sK!Kjnk5aj&GgKieX@S7f@o~}ePD!qM0
zsnqK*e8*K|NT4an&5yCW0pFiQb{d>#zzxp=7m)etnW6wO3{|zud{b=M-2uZ(bd$@a
z-NIkOOiY3hK8Izk`0K$&{Rl;!GG9m}^&+w2LE*)$W*Fu^;VlP7mA&BGlg3e4|N7~4
z`b`)fJtLagDG@EllA=&p#Gvp<77K>yrY-!#%gXtoWlX5=8HKwW*tEiHDw2+RZq^rt
znE8d8ueQ?~f>iLT&rdu8hE^lj!xE~)SM3re441swM&Ek*^fN)FDT%#m^4u7L`hL2w
zEN9izA>@Y$!t!jN8vzi1ef|c`8I5V88HwF#XpKT3X0GcRiZZ7QrjMhrX!pWvr7&Fj
z_ZVd7e!agy2F;DsE*P#%dT;kSn$(SwP@{?#!4VYrymZ~l%~5NDUW0iSKu8+<k|p1a
z{KAGeNY=Rq<MH0;n%-C3nE5l%(i6kUZ4gAVF<W-^73xU-!WcEQ=D!D0?k6GKOKgRn
zJ4msYPJdzmz`RnYX1AF^5aJ8T>T5I}Pdj;j%6z$Xv=Leoim;IYz~~0PYqHb;mmHKG
z1c%_I?<Zp=rW`MVYo%z$1{{#3gMx1*9gGPi$5Hm11z7B-kqg#b|9KXC?^i_&G@y95
z0p|s}Zikg(wm?wI!p0SauO2HE(9+L^5X3Th-z$1({WTJy`oRUa7mpwQIc~-MXy{4@
zl$*QhxfLMz@NHV38*NHT%;bY3*}pDhWs4Pp!5zw4_5t0tmoq-xy$?`XHNZ<?2d>`v
zl-tm|9J$M2J;o;00WX%2!F{3&&hCqya@|*i4BR?RFn5Q;Tb{#bBW}P?z*^qAaPs`j
zLCfIwXS<_z0J^zf=;m@a4~R3Y2`#|bb+TMF!^gV`M{;IRK;?m$6BQ{}Sof@YuSk1?
z!YrTw^6kfiz&<NGo;Oe!xz2Jgfx#yOI{m@G2jHrRy7ImmiM?e&`y=Ukj=xvW_hBO6
zF5;?zlT07goH?sCqE7e{1uRGkRg{ETJeKxMLGRFzAi&bU{lQb*9z0&~&Z_54J6>$%
zr|DmDHmuM<BXy%2PUjx<I!oQR$FF^t*h&*_5Zzr!7^p0H(|Q0OeYv<M=>*HIoNorb
z7GHJpoJ086EH1o^s7<O^Bn)2-&8}xQJkr2!hzx255MU)&ZXwmA+5a|6zkcSWwBNpc
zTIa0!*pxpG^aP$R`xTLI7w}+8UuHK~mJaL)Y3Gx{l;$sn<501I9M;hS+<t)AbwsJF
zo<vyn1zQQ=zVkk7{`$}@utuxda(6JS05GD7KyZ$gi>`1ZuQKlBO!-3)wB*N2=I#Ss
zeTD`QH{bn;dUhWw$3-7V5PWsnD`eccWCASKQ(a3UOq6RN5Lt0Y(QTZVA~3L3I`CmC
zi5+@{71Kuj0SMc0NTE3x^hBikJ57E2A68_1AU6BEU{ED-8w+vBMJ&8d@5EEBo=vkv
z=i-M&7v_X&3bR*qH&mXCL5RQisXS>gUN~U7C%xAw4|6hjwA@Uq_pMe>&<C<pF;+IR
z^?t+2(_tkBN|QqRiCo;CtBkx$4M$TKl4q`|24dhCy<&qje$a~kAQIt2SLrI%HVrE}
z@-TJSWaj18&Rs5gR|5$5$^*L*GmVC;?>czR8Nv$?Yx9%1s}t$AUl~id5WrBs>1e9m
zHAS#Afk)Bi_T<JToX(?G9|{<$J6c#}s|*gKdRppW$lENfS@P{4kvUbxb&oTPW|fG$
z@OD>|2Ibz0i|RO06o#{95An4l+vyS36L0s6>40|6raSF?F?SCb(m!GK@or@HY}^$%
z=|^~Wyhwjetm4&h!2cTgCV$U>cJE){q<t;3w7SS676DgSzWdwxwX@#BAcXjD#`Z5W
z*!-xst=|<foClt$=-MU9<q;xLNb&a>15b<Bz0Kk(pmHME`gwMVVeL;N*!(o{->e3-
z1%Fw>DcN$u2|#+Yen_fsMN*q(n01w1WcDo*b1Cfjt5G&YC`g#bylsunRzanQ;?LZ%
zYfP#ztE>p#5ip$SjBa?bso3tC7v3)UK-);_c|Ns}f&6%(!tAwU8LFzy2f)uIOw>iA
zuY3E~@Nas0w9M+6K|nxTee(HVcLWY6cID2A5(X|<0w6m)_2vVMvu3YtV_n#yeFIOe
z0Py>8^P3N@NHLpp=RCyK`Vea`^C8n?ppq4>5^{m%o_&*#DYkq09dMRHF@TR=iJrXy
zq&*!YYB;0}dI0>w(JM|JspoG?x!lUt60<!3@)o7k!Q8ht@{c&d+ZdnqSo(|vWhQK*
zf9lm}tv2EA2cp8Q8+iZo*DLGvZzYe=07X${p>mbDE;@l+#X#n~;#<6J4QNwABYbpv
zRR(T*-9`2X{gq`^fWy1cl1Ee!;)IJg_dCuueCL1OfR<Wf1pvlc;%bApfkEFlJXnu>
zdjK4WIn2^qVFbpV4=EK*RrVHO!us;1rFOvV(dd*4N>xrPoD|Vg`5jYA6ZBTx6y8R_
zKgvz=typsU4$ygv4WgxVV`+6uPp<%~ay0}(gLrAlDF}=zfn&DxVO;?O=z9U|ZBl+(
zAW*RcfVB)olbb9;PXH*mYV`U=2T`W4e*ia-V0pCo=vmX(S*B7}Sa&&WtvbO?MS9y~
z5ydx$cI%yp461Dq<tl;AU5fGfV$mn&M#ut|@M_0_FG_I-wlVV3M90A$y2+*e5xfui
z5r@ns;01Usgnm<lNP^oZJ=4Bt8F*@`Yh3lhw?BoKv;_`8B=#iYEtVZ#2(gkUs%%*W
z=;^StrmR4p$LzCU6<r>-IAz})^1$uh#+VE8N|BoQ`=-$wPLJ9j0cuuYPHIR8uvW)x
znx=je?0eI*Ef0@BlP9io3M6=$vjUZqL%QLlfStFJ2i3)5z(dh4wGdAFNr635O<V)m
z+Na(C7}g4M_H}-=cF6hh@q`Iuuqelg15N>J0Gc=7VSo#^?<-%Wq`~8JNd(%B<T(JF
z(?IyV9%28=szZsd?|FFD=>Y+M=AD@RY7H<Ow`C-`&je^Z01k|MYp^_VqtiuzBxj$v
zqn=S7g1`2<cm2TAt>DoWoIOiEC*}QvJ2)iN7;sW=bXE4IdM3cyezD2vB1gLfhE3Sw
z>Zhz3l=yx^(qJB&w*?$sjrNJR=IDU%RaKjEs$>&FeClzPZ6vJ|ybIP3X!G`g^Fq1G
z)^iPzKM-LJRkiA`R<-T=9Wb^7s-ilEqz?XdjWIfTBpq-yZw=2zGs{DP@T=h+V4I9z
z4`0NK%vonXP8p^BRQ3#y*KkN0wChLex4^y*n#|U{wj)xsCMQL#*Ba{}y%W0jWaSWY
z7hL(>PH}Y|W=)3)VpSWugCqqyrVf()iy-F-UR92ZfiYzAQ^ddp;~NL?*IahDy;DbM
zBs;wut~SP_7;`jH^2kSs1g&aaw0}uoBl54xDFjT+?cQju_4Po~$~Gi!69Mmi>Z1KM
z)x|Zs#jLI8lKT|KPiYVY_~mo6)yEIB6bQ6C+PHNO?8s_QX7IqvGe)Xs`~i9ck2G*+
zjh=dK)&lw1lqKhtG!nXyhrmAXVy0JRGaB|F>~X<uM=c<e-U_=nLH?(q6l!O}M7b`w
z`?UOG#ntW>2q_(tig8HkQ|mf?h9ID8_k66%R#!nu2ePwFy4X&!JVgNi)j1?(@cx`S
zfTKl|531UN@MYIpQb+t*I|#$mK?8TRclMS-B-i|ywn0R&84F!8!rl^92&NJiS&^CQ
ztLlrELPbQmTS<e#^b4?7YAjD~z)4?`5X@*0x>groty-j{^?E=gi-M3ggHkL1vrx*x
z_2*Is<?`2Qmcks`)daVYplfiIEBaVnxFMeak=XgDj?|GELJp(h{_Uzm+isEWz*>sm
z>cjU_+0t;xNx^H%VIaK1Z^j9lp3>>_vVW82je2axG6~Fb$auu==4ayt{Ey-6hinnN
z1Lc3QZGkxOSuca{573uuXD?ab2*RgdW*_F$cYfW4*K2T*m<>3~ikMPdjRo6fPQt4G
z^D+ZOmeF%2allz~g0+t@TrdA}N>r7z{VT#+4e=#a>;03?MZ!%+gLr6WqUuv_=Pvww
zOSf>}Kvm%)UJAZlS>9BYqwikKBnY~6c<)o6pTPtMHNrXryfX{o14lHh(1<Uu3%SvY
zm(6a3;G3*^67Ap1<!>C)M5t1<GJon!Uf$+^6H3Y1^3`zuVds<S+jD4y>g*7;WcE^p
z6Dx%<oPrqSYudl}?L=iF5l7nAg;wfWp&y&G5;UinCMD(zB=8hJ@^^(aapx;~aRZ1G
z?`pO59-md7*|yvX(`y?g#4~(h<+dB4_yP3ftL4i3Q;N&Fo%rEeud*WjWz-pwBEcN#
ze>YYr@;0#MTgP$cXu85Mx>HD{-nmIvu>xWE-Fgebgh|O3*9}h?z8wVDC_~{FAA{~v
zE9qdfymj9*Z-W=Y%&7^mYvGa^mCl}@{TE1L9YQ<r!Ggn?2S=zTM}6>Ll%_N>aet>f
zsGyqs@wyf~Tgl!t4_e5ZFGH+otKJH4s}@vK06wx4U1RsFtNsh#UTAD8c=^zo2O8A+
zq_fc2^ky7tC+2n<|BS@a0`1>nzHr{8#t|MdWBD}q6q(fAmC!AO2<SCU*2?kM>as<`
z8>HA|s8`H={BxULg(y+d2E9HA#++79BwdBZW)F5g{Fx?iP~tazA9}qIv2y+XtF5k{
z?E#4N#m41=anixDlh-B->3@X>?aN+H#rnh?vxsPf9X>0%PW-$?8b8&+m~-uzc3Qr5
z|4kNmS9=H|{lk9Th9_0yUuC`(b&E)dOH+Y#?8t@juL125i1d%4^pp4BKfvj~=d}^M
zGg^2x7gjEpcrioFSxtj|ZITv~Zu@1*%8sua7YW{0vAom;%QLao&&?uQV22~}?kBcf
zntCshUD*uo`%X))-Z5783SyQqV$K>sPx~$GxHMxG#pvegE^I{%EPF*2N7BkQBq@k*
zUWoKh`&N{X*0$wuj_qAskgK*Jk@5{P`H!84yzncrgpG#1#yR!Jdb=kb7oOqv3YM2u
zSIpcSZSSqCKuV6G5Y>zaS+@u6%05lrqZ`DOXM^m6-_*o%^<a+ra|_aTf}p{1YH_)0
z(Een_q%qy*sJ<rY2E5v)UehBlQNGlqTZ5Fy5Cp4VQ6g6C%P;C(r^pN5u9}IZbZY2K
zjl?>vQRO|)81K3Zk=0FD##jYZ)JzXaUgC5$r(b5>fc>A$JX+R_YP32(>4=~AKyVrr
zB|BD%K3fO_>IQ{@61;0n`#?a{>BfcNoV<<hTS?Xocw*J5S)}>+jZPGK_&Qzha+xhS
zQ3leNRl1H}<;F}TOz)pVb2JHp%LPi?XH-6ZS$FjKC!&r);UlU_x#&9U(Ku{4wNsKF
z#k3rovBd=l3QeJ<`M9XUKu-9PG`>Ao?igj*ILmdgPl8jaP&*@3h^nA)bsVSUwI2Gu
z=ii15b|W~4yk->X>x*wb`6MY=Vfq)~)|Jd`tu7|u)>o*_P*52lfwk@hUtt{nI306-
z3QVmKn&!Eo4f$<?g3l7SeASw)Zg;(sUn?ulWa%Z4-O<D=oJUu~qx(kC7W@>pNFl1^
zm$1TTt^4K&8ncSvf*=shB~BaDyXctJ<rDWJj~C%KwqaDgCNcd&nqFBUM&1@9dOk41
z_H^SC**rA651rN*GG0mvJK+;naWkykgVP;zVy6bjkO3Dgy4GE`RvF&G{vk7gY%<Hz
zZ7ZuPyk1#elQiPeD&ttI`leO6aI|b4TNsk2KJ$x^ehpp?!q4A*sr@k@`y6EH&Ry($
zzP)N`$I5MZ!vXw!&C4sALp<=T`rDI9KfGQoMEVw8_D%4pbuZq#y<_SlWKaykJJ)rw
zB3Z5vxK^$5H=SqDD;XfhQ|~H@<-NoU=n=5rqy>Up3)AVdQ#)2vo^Jse7^h_~3p92Q
z1LjCVaf;T2Zdl8_yRaLH?E|1}GlSCeQ>oxKs4V$3`4sB&KwxkA@&Z;2z8=8q!Plk>
zz}n)>pgz$vs(Vb)dnQ~UF4@_a$<#_D2$m14Hw!8BMwpKA<JU|l;=PZ9S8mRXC3jP1
z&sm6+D4K4fH^ZBQ@ZM#%3*q_5^HbZQv8KtJbmMwvWgI~u$WysobZDl6+5s;ewzA^y
zg>(Y&-koN2R1AD*>Qa~)>!{}BC+aP@7=;+PaN2RQV<Dqc!<;buGMR3F86y3QDOBYs
zpV{+3vaZvx1D?wt>NA&YM4a(PU=Q~T-z@CQ-)PtqN}!#SrCY_Ee1!K7AP9c8MOpVU
z7f>tu?&Ud<NsHH1Xx8RgM&-{8`2JhH>cX8pB8eY2Lhv(2eyH~<&JQnd208QBcPd%)
zZ!SCLtGqyCIrY=|QKw=B>k;}5@SJPnq*AABtSE88DSy9Ud5*6kp;cFq2{bOmYI8$Z
z2ro+X!LibJj1?<55qUhDx^9rKjzEEgM3%{*;7zO2i@rojLB5xu@J+AAf~hMiG43+F
z4~58yIJu2G+VFn*%kugRK?mU(%2i?ewC2Kh)uya%3^*63e{F`aXI0H{nz?M&EIR1l
zM!+eHCe3i#qSB=65bKg}?_T;jf87PL1^;nax#3KLxD-8ux8Oa+t=k?~4lidC@Z+iI
z!QOCsx&JD6^Pwr{sES~&tRuN3X^e<7D4E8&DloGwR1k<G!Fa**4^u(ajKzse-3(#G
zI7n?Lj28xT_05H0l_!Nb^+k@_wMngho_aqD@udlbBlgPM$L<DmbuYG}A5e8e$chee
zs1cH~T)Us)EKvpg*3Xz)@Q9U#o~@f~34+QU;I(7fvtBhr>kY@?qPXJpXt7Hx>JUkz
zxOH=M7}LX>pA!Ziv{b!3OqtW15ZS-WP(?)3E5Cr-^a!KahSiORNWCcV;x_2#yUM>C
z;Cg3&J?0vXr+p8ya*t^P&Ovw@8#IHv6VlZY`i&rD0@or4z(8UeG?Ok#gRzKf|7+la
z$5+)s)&@V{$olO+(<SR3h{xu3p9eA|9F%SltHH|yB!{r>3iS<m{|enKT@{cMLa5$o
z5ba}wR4GFBdV?qkB;KVcdBGrO3&RB*<;Y-GgUHSsAYk1yc*;BchspLMAm65C=&2P@
z$})H$2?QiFb+v%$dFc%Myj1gmu>EU{GI&0Kf>O7p#O76L`?Rzzz6Ju=&mdBKr7pJ8
z4F(Z!1On^72jBi60%i94hkbbOzvVz<l(lGf2W0Z&U*O!^`$3pHz6CPb*8%6g3I)OK
z2B|a=T1v3l<)I}AdefQ$0Q?OW43OrPrSbTdv_1=<2{}=#Q7R=Qt@pRCuAH=+%Lb1E
z>8SB%X;;lb8ZJk^;rI|3pT|K`6EGCjf;30?c95ZyrUu?}JSdFMY)$_X52e~??>@H%
zw>juM&K%0Ejk^I4c0_=|G^AwmR;{jVBga5i_6<izR(3;J5rTF_cXbrbsLSIR9ICB-
z&=6z6m-Ei*Hb@igD64(Ye5Y)zY~6>^i6HhcJ9Nf!Gy`yyw-uj8+#NfSTv=jOre%L}
zi(XM7CTUn^b_%1UV_z0N$5&CRQ(Y|6*=?=j$#c*vBWU%i^s7l8j!085cL~?VPR6A5
z?(-IccrhrA7x5u()0+dBGK$tN!*>E5Z=p;GSw0VQd|+-jFE4GkYF=yjeB<M=Cfg6v
zl-!BiT78=mND6XTjYW=fAZKIr9!nmwY*LMOCC)uJP7Y0UnVnKos`DF;tNRfc$kJr@
z&O2F}x5&C7EZtO&vT<0+b*^qIMz*8Q&=|~LiD;{Ei=>~&2^a96yg&MB(qM*cB8OF!
zC(5hzZc^#9D2v;Cha=M_E-XA<RbkN2Q|j-@M<T_4J1b4)TphjGw5N%mkj8UXBH#4C
zh&lB*tir>>({Y5Pn;U0)ha*=wTCU$Wl8d-RY4dMv{gMBqBpJ6+wqQ=E=gpg{Eazio
zZLzZ182v@8@*;MF+w`u9t2Ts!5Qdw!z*ge<q0aCbUJyT0ag=>1u0Bpd#lx^ZPEMsS
z&7y}_dAdfFOv)T-07ktz=T$Qr&U51i;@gEXa;;B2kL>i-IFfx0nBZyIS=_#PwlsM-
z|1^t~d27uuuS5!Z+YIK6z_I3Fx|AU60N7kROY%!#!lP{nj-xrI!G>_@9rB3HR){n-
z%e)ufyqj<-q}1(#G3Y12_rkA&eum}|8{myY#e(N-X-2Sv;pPPLH<xpm_ipb6nZOB#
z{v6uHB?{!MReHTSjypjb*7r@Tf}(Kn77!He(J^}F=(v>AtvGEo<B}yv2H$<Fg*<Xl
zcjWp3|CWo?bEDxP`#v$ytHjyfK?*Bk<W1}_Xz&9J(WK_lGtYu=G(2gVJ~0cpO&AqF
zG&h(_IJ@KZM^DKvPYB9&EJJX%Ke-;{-xArX{76ucP^-EMLGL=$?vea5g08b-QnQSG
zQJ-Fc1BlajVNP9@CjTw~fQ`8Z*BD>CJq#U6VeX6Lqi1wmqpvdVtOm`esh~+`Vff2O
z*zH#i1C{gT^61k|#lW<$4{)|SUJvu{cwc%6rN;n|BW^5+wqkdL48P5_5Fw^xqCtL!
z)94}DbusG<pwtyS$vVaLtAOF?0X0>cr2`=D)?Iio?XC#erJSSJW;RCocW0JfdaDNL
zh>~3|KtlfL3xP~Md}Kh)#|*d0W&WZ^fA1BopV%i|INJA?d^8>6@ZPze(<i#F93-rc
zOzPsi#vA=!zVb9I2AM63UYZhdqjA`&S6VhHTG>=g@o60o&DmN_{+`oXIU5t={&f{>
zD=(6kajyNT!#FMeQrgBq><0eQ045>Mq1e7rK2=;{pxUGuJ$h;j?P;48yEg=Rx9a3g
zuHwCSPl^y0{M-*(j|)B6{7rYtUiZ0;9ygGlD~<kTJHiS-n$FpzY}ixwx)=Uzq3&{5
zw&Qw~Smg!JX*$MpX#&|Vz!bNtwPB8Lu@G1&k+j;dihM0zP=B9_63O{o+(ytrRF--u
zk>zH=6!!Rt?3BnGjVqbSU@98}hZ`doXP+Hoy0+JdtJCMOH{v!pT#=6kDf?D`SzQj=
zZH_0CA;Ku!;V4C7WTh7=?TTV5M^<(s?8H%T9_Ae|D#`rwX`md((Pw_%Tq^|BKDxHN
zTYQ64kZq&la^p71lT~u#Ha^1W^R@cY`g_!hu|A7=1U+tYZq6nZP9vf3#U{A}ts7FY
zr()7X=sE?5IQ=zw;*x=|@{A90Znx^>r6;a8F9MXZXPK8)&!bJprXFbRMr@zjs_JK*
z2a+hSdV}inS|18Vi}fo_a&vD24C1z~QW2<6eeu>%{a`%aAj??d%2i0qCWk^(OIdEs
zy>FzImx=SBBxLZSN2eduL%=3l{+Dy6V`N?T3Q&i^&%b-X_1ceo`}goD=@oP+H07_X
z=&$;#z$1ZcRiuKR!}Pu=Y3=0blepVxv$2<C?ss4(ue#S$7)!s}eHL$rpp%GvZ&1o=
zL)7$wY$|@iiT%)q;8LJA1TJA-N&5k@Zw+5R3{<bi(l)p^7crJT%RC1x$L0+mw){h{
zAmT<+%P-5w%b*fCHur|>yC3y-Dc98#d}ARtOyRI5x)|@LX`rlV(lLD|f(@H5Y?gM8
zv43GKZ#_o@cYIRe$K^=NP{BPbkvvdDw^R06dlcf+=g3Zk2;AaT={+u|pm&QY`QRgt
z;rWkRNKh%fwxC}Po&hN|-RI_@(&%zzTNkMErF@8-K8ED9U0rsR&OYVuHQWGDmNc0A
zWqF(Q$#HWzhr@&nl29>)hX7}tPFY80G?KIZy`Tle7zpwGjJ}J4494ii{aI}=JQsgH
zu4L2)aU@$YrnDOrDlg3qET0>#gADp(r`E5W1Q=Ui2q>f$2HkXscRCD|{hWCTuF<Xy
zkim~~E9zZ9L1$hzXCDA82|E@d>7brj*&kCe#3%_8bmgg*3sb?O#D7p-Hs<(&nr@2_
z%LO@nZ<AQQqQKppbS(PRw_Z?)6U0+D9QB_+52*+OCBfBT&8uiGgTg(WSO!i_m+EkC
z8Ym||^(@O_q;xezaAFK@;~=H4zEYaTAYXs_I8s7Q6FgnEla_lmrsV1BBg_pU0{%_J
z%V|CrI8@oSp_$!jDAoN4@-G4Gp7-E=B3Uq4Ij5yTD7*S(%A_+E;DE+kQa=(q@>S=B
z=*7%N1VTc!5GhJ1*m{PR>I*@gBu46vDuToXb+$UW8J7I8`TR7KE}sB2DZrk3A&iBy
z0tNIhM(3uj7nr~~dHLEcf}FMbeTLxC!uk~i8o0xy^d8*>U+fk}<#&d?XSsSUpla~x
z^O2}x%GyT(Ba<Bx)nzxSgSiwSx+_}X&7t_fuJXj`>vZMI;OVR1RlKurJAuqd8Vlws
z_z6=NfOT>{>wHCiGtmhZ#Al(Jdw->CTOkqtCFT;V{5{?}1aF5L{!6NJOxa5!D8&!{
zplv9WU$Do%LSn-UG+ziQ%aka_b_QHI-gQECDwY%A9YOHU{WRGkd4k(8B$UO4;{`uc
zb-(I=gIk#82k_f(qn}J4n{sv4-C0rtp0u2EQ?|<+oBL|#OhI=4ThB4A9EZy%woi*e
z&JVlPEIcpKwh$hl3nL82nVr+gvABFvG_^NOTKXJ6-6+Y)H`pmn;W~6oqB~UssjipH
z9xY^pVbajKsYb3!te}EJ2)YheDNp7_Wex{f@Mb_jb?Omk7ruQ!E{bV5nYW^u(U%Ld
zcJ23b$6?)xOq24yx-8f7zGR$2ARd2Bw^x7JDnsbEU}?d37Do`;ClaDc-i)_sDz<8Y
z2*{$>n5u-X4F#Vhc!r&(a5tM%b&tZ&T6Lb`=f9WU)FE-QUBpn^tW7F>ao9=ON~ST@
z6dmUPjzGTssncPlcd6S$h{_qFrm*rOt$PLT;LDw%gtR{W<@$+_aV9FgdKNvq`}unP
zJ+A!%y?()Z8reaip3yLrTQ@>dYiw0c<!Gn2YJZATekX`v^GwqEYGG^uzO0Fu)+0Ag
ze9^zlvA#~R4Ws!iOG{<X&e=HkV(cmR{*JpI{ldR$^@5VIt*m*g`n}x8MLDCVPM*vO
zD@q<^xIAQ@4r5xS@i4dGqyy6A+MaZq*BPI_ly9)zAR?+6Ln{42<BTKtp!x>Ezy2$5
s%rxF7uwM<NQOy5+MfT4=q5G!$1$;AokNuS-{px%#!581WJMQGa0g=gzg#Z8m

literal 0
HcmV?d00001

diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-1024.png b/Assets.xcassets/RimeIcon.appiconset/icon-512x512@2.png
similarity index 100%
rename from Assets.xcassets/RimeIcon.appiconset/rime-1024.png
rename to Assets.xcassets/RimeIcon.appiconset/icon-512x512@2.png
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..a1e95ff14
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,95 @@
+cmake_minimum_required(VERSION 3.30)
+project(squirrel VERSION 1.0.2 LANGUAGES CXX Swift)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+# ##############################################################################
+# Options
+# ##############################################################################
+set(DEV_ID "UNSET" CACHE STRING "Dev ID for code-signing")
+set(SIGN_KEY "UNSET" CACHE STRING "Sign key for code-signing")
+option(FIXUP_WHEN_BUILD "Fix-up the app bundle in build time" ON)
+
+if(NOT (DEV_ID STREQUAL "UNSET") AND (SIGN_KEY STREQUAL "UNSET"))
+  set(SIGN_KEY "Developer ID Application: ${DEV_ID}")
+endif()
+
+# ##############################################################################
+# Dependencies
+# ##############################################################################
+include(AddSparkle)
+include(AddRime)
+
+# ##############################################################################
+# Squirrel.app
+# ##############################################################################
+file(GLOB SRCS "${PROJECT_SOURCE_DIR}/Sources/*.swift")
+add_executable(Squirrel MACOSX_BUNDLE ${SRCS})
+target_compile_options(Squirrel PRIVATE
+  -import-objc-header "${PROJECT_SOURCE_DIR}/Sources/Squirrel-Bridging-Header.h"
+  -enable-bare-slash-regex
+)
+target_include_directories(Squirrel PRIVATE
+  "${PROJECT_SOURCE_DIR}/Sources"
+  "${PROJECT_SOURCE_DIR}/librime/src"
+)
+target_link_libraries(Squirrel PRIVATE rime Sparkle)
+
+set(BUNDLE_PATH "${PROJECT_BINARY_DIR}/Squirrel.app")
+set(BUNDLE_CONTENTS_DIR "${BUNDLE_PATH}/Contents")
+set(BUNDLE_BIN_DIR "${BUNDLE_CONTENTS_DIR}/MacOS")
+set(BUNDLE_RESOURCES_DIR "${BUNDLE_CONTENTS_DIR}/Resources")
+set(BUNDLE_FRAMEWORKS_DIR "${BUNDLE_CONTENTS_DIR}/Frameworks")
+set(BUNDLE_SHARED_SUPPORT_DIR "${BUNDLE_CONTENTS_DIR}/SharedSupport")
+
+set_target_properties(Squirrel PROPERTIES
+  MACOSX_BUNDLE_GUI_IDENTIFIER im.rime.inputmethod.Squirrel
+  MACOSX_BUNDLE_BUNDLE_VERSION ${CMAKE_PROJECT_VERSION}
+)
+
+# Copy additional binaries
+file(GLOB RIME_PROGRAMS "${CMAKE_BINARY_DIR}/librime/bin/rime_*")
+add_custom_command(TARGET Squirrel POST_BUILD
+  COMMAND cp -a "${CMAKE_BINARY_DIR}/librime/bin/rime_*" ${BUNDLE_BIN_DIR})
+
+# Copy resources
+add_subdirectory(resources)
+
+# Copy built-in schemas
+add_subdirectory(data)
+
+# Copy linked frameworks and libraries
+add_custom_command(TARGET Squirrel POST_BUILD
+  COMMAND rsync -a "${CMAKE_CURRENT_BINARY_DIR}/librime/lib/" "${BUNDLE_FRAMEWORKS_DIR}"
+          --exclude pkgconfig
+)
+add_custom_command(TARGET Squirrel POST_BUILD
+  COMMAND rsync -a "${CMAKE_BINARY_DIR}/Sparkle.framework"
+          "${BUNDLE_FRAMEWORKS_DIR}"
+          --exclude=Headers --exclude=PrivateHeaders --exclude=Modules
+)
+
+# Fix linking so that the bundle is standalone
+set(FIXUP_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/fixup.cmake)
+set(FIXUP_DIRS "${BUNDLE_FRAMEWORKS_DIR}")
+file(WRITE ${FIXUP_SCRIPT} "
+  include(BundleUtilities)
+  file(GLOB PLUGINS ${BUNDLE_FRAMEWORKS_DIR}/rime-plugins/*.dylib)
+  fixup_bundle(\"${BUNDLE_PATH}\" \"\${PLUGINS}\" \"${FIXUP_DIRS}\")
+")
+if(${FIXUP_WHEN_BUILD})
+  add_custom_command(TARGET Squirrel POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -P ${FIXUP_SCRIPT}
+  )
+endif()
+
+# Install (for development)
+set(CMAKE_SKIP_RPATH TRUE)   # done by fixup_bundle
+install(SCRIPT ${FIXUP_SCRIPT})
+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target sign)")
+install(TARGETS Squirrel BUNDLE DESTINATION "/Library/Input\ Methods")
+
+# ##############################################################################
+# Distribution
+# ##############################################################################
+add_subdirectory(package)
diff --git a/INSTALL.md b/INSTALL.md
index 3483eb4c9..16681b2cd 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -182,3 +182,20 @@ make clean-package
 If you want to clean all above, do all.
 
 That's it, a verbal journal. Thanks for riming with Squirrel.
+
+## Build with CMake
+
+Alternatively, Squirrel can be built with CMake. Universal binaries are not supported.
+
+Note that universal binaries are not supported, and Xcode command line tools are still required.
+
+```sh
+cmake -S. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 -DDEV_ID='YourDevID'
+cd build
+ninja          # Create build/Squirrel.app
+ninja sign     # Code-sign build/Squirrel.app (*)
+ninja package  # Create package/Squirrel.pkg (*)
+ninja install  # Directly install to '/Library/Input Methods' (*)
+```
+
+(*) `sign`, `install`, and `package` require code-signing `DEV_ID` or `SIGN_KEY` to be set.
diff --git a/cmake/AddRime.cmake b/cmake/AddRime.cmake
new file mode 100644
index 000000000..32ca3baa8
--- /dev/null
+++ b/cmake/AddRime.cmake
@@ -0,0 +1,22 @@
+include(ExternalProject)
+
+ExternalProject_Add(BuildRime
+  SOURCE_DIR "${PROJECT_SOURCE_DIR}/librime"
+  INSTALL_DIR "${PROJECT_BINARY_DIR}/librime"
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+             -DCMAKE_BUILD_TYPE=Release
+             -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+             -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+             -DBUILD_MERGED_PLUGINS=OFF
+             -DENABLE_EXTERNAL_PLUGINS=ON
+             -DBUILD_TEST=OFF
+)
+
+add_library(rime INTERFACE)
+add_dependencies(rime BuildRime)
+target_include_directories(rime INTERFACE "${PROJECT_BINARY_DIR}/librime/include")
+target_link_directories(rime INTERFACE "${PROJECT_BINARY_DIR}/librime/lib/")
+target_link_libraries(rime INTERFACE -lrime)
+
+find_path(X11Keysym X11/keysym.h)
+target_include_directories(rime INTERFACE ${X11Keysym})
diff --git a/cmake/AddSparkle.cmake b/cmake/AddSparkle.cmake
new file mode 100644
index 000000000..d0bd9b4cc
--- /dev/null
+++ b/cmake/AddSparkle.cmake
@@ -0,0 +1,18 @@
+include(ExternalProject)
+
+ExternalProject_Add(BuildSparkle
+  SOURCE_DIR "${PROJECT_SOURCE_DIR}/Sparkle"
+
+  CONFIGURE_COMMAND ""
+
+  BUILD_COMMAND xcodebuild -project "<SOURCE_DIR>/Sparkle.xcodeproj" -scheme Sparkle -configuration Release
+  BUILD_IN_SOURCE TRUE
+
+  # Install Sparkle.framework
+  INSTALL_COMMAND cp -a "<SOURCE_DIR>/build/Release/Sparkle.framework" "${CMAKE_BINARY_DIR}"
+)
+
+add_library(Sparkle INTERFACE)
+add_dependencies(Sparkle BuildSparkle)
+target_include_directories(Sparkle INTERFACE "${CMAKE_BINARY_DIR}/Sparkle.framework/Headers")
+target_link_libraries(Sparkle INTERFACE "${CMAKE_BINARY_DIR}/Sparkle.framework")
diff --git a/cmake/AppleUtils.cmake b/cmake/AppleUtils.cmake
new file mode 100644
index 000000000..4fbe4e816
--- /dev/null
+++ b/cmake/AppleUtils.cmake
@@ -0,0 +1,10 @@
+macro(process_xcstrings path outdir)
+  get_filename_component(basename ${path} NAME_WLE)
+  set(target ${outdir}/en.lproj/${basename}.strings)
+  add_custom_command(
+    OUTPUT ${target}
+    COMMAND xcrun xcstringstool compile ${path} --output-directory ${outdir}
+    COMMENT "Process ${basename}.xcstrings"
+  )
+  add_custom_target(xcstrings_${basename} ALL DEPENDS ${target})
+endmacro()
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 000000000..7cf9a1c4f
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(OUTDIR "${BUNDLE_SHARED_SUPPORT_DIR}")
+
+# ##############################################################################
+# Plum
+# ##############################################################################
+add_custom_command(
+  OUTPUT "${OUTDIR}/default.yaml"
+  COMMAND make "OUTPUT=${OUTDIR}" -C "${PROJECT_SOURCE_DIR}/plum"
+  COMMENT "plum: update default schemas")
+add_custom_target(plum-data ALL
+  DEPENDS "${OUTDIR}/default.yaml")
+
+# ##############################################################################
+# OpenCC
+# ##############################################################################
+add_custom_command(
+  OUTPUT "${OUTDIR}/opencc/s2t.json"
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/librime/share/opencc ${OUTDIR}/opencc
+  COMMENT "opencc: copy data")
+add_custom_target(opencc-data ALL
+  DEPENDS "${OUTDIR}/opencc/s2t.json")
diff --git a/librime b/librime
index 6b1b41f53..0cf0e63b3 160000
--- a/librime
+++ b/librime
@@ -1 +1 @@
-Subproject commit 6b1b41f53cd7fb8cd605c65cfb1e8d5c780f1308
+Subproject commit 0cf0e63b3a5460541bdd5110ec8f4bd31d647885
diff --git a/package/CMakeLists.txt b/package/CMakeLists.txt
new file mode 100644
index 000000000..4b0caf82b
--- /dev/null
+++ b/package/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_custom_target(sign
+  COMMAND codesign --deep --force --options runtime --timestamp --verbose
+          --entitlements "${PROJECT_SOURCE_DIR}/resources/Squirrel.entitlements"
+          --sign "${SIGN_KEY}" "${BUNDLE_PATH}"
+  DEPENDS Squirrel
+)
+
+add_custom_target(package
+  COMMAND ./make_package
+  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+  DEPENDS sign
+)
diff --git a/package/make_package b/package/make_package
index 61ce71b69..6efc96ac9 100755
--- a/package/make_package
+++ b/package/make_package
@@ -7,9 +7,16 @@ INSTALL_LOCATION='/Library/Input Methods'
 cd "$(dirname $0)"
 source common.sh
 
+if [ -e "${PROJECT_ROOT}/build/Squirrel.app" ]; then
+    ROOT=`mktemp -d`
+    cp -a "${PROJECT_ROOT}/build/Squirrel.app" "$ROOT"
+else
+    ROOT="${PROJECT_ROOT}/${DERIVED_DATA_PATH}/Build/Products/Release"
+fi
+
 pkgbuild \
     --info PackageInfo \
-    --root "${PROJECT_ROOT}/${DERIVED_DATA_PATH}/Build/Products/Release" \
+    --root "$ROOT" \
     --filter '.*\.swiftmodule$' \
     --component-plist Squirrel-component.plist \
     --identifier "${BUNDLE_IDENTIFIER}" \
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
new file mode 100644
index 000000000..9ba96cc96
--- /dev/null
+++ b/resources/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Info.plist
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" INFO_PLIST)
+string(REPLACE "$(PRODUCT_BUNDLE_IDENTIFIER)" "@MACOSX_BUNDLE_GUI_IDENTIFIER@" INFO_PLIST "${INFO_PLIST}")
+string(REPLACE "$(CURRENT_PROJECT_VERSION)" "@MACOSX_BUNDLE_BUNDLE_VERSION@" INFO_PLIST "${INFO_PLIST}")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Info.plist" "${INFO_PLIST}")
+set_target_properties(Squirrel PROPERTIES
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
+)
+
+# Static resources
+set(FILES
+  ${PROJECT_SOURCE_DIR}/README.md
+  ${PROJECT_SOURCE_DIR}/LICENSE.txt
+  rime.pdf
+)
+foreach(f ${FILES})
+  get_filename_component(filename ${f} NAME)
+  configure_file(${f} ${BUNDLE_RESOURCES_DIR}/${filename} COPYONLY)
+endforeach()
+
+# Localization
+include(AppleUtils)
+process_xcstrings(${CMAKE_CURRENT_SOURCE_DIR}/Localizable.xcstrings ${BUNDLE_RESOURCES_DIR})
+process_xcstrings(${CMAKE_CURRENT_SOURCE_DIR}/InfoPlist.xcstrings ${BUNDLE_RESOURCES_DIR})
+
+# RimeIcon.icns
+add_custom_command(
+  OUTPUT ${BUNDLE_RESOURCES_DIR}/RimeIcon.icns
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/Assets.xcassets/RimeIcon.appiconset ${CMAKE_BINARY_DIR}/RimeIcon.iconset && iconutil -c icns ${CMAKE_BINARY_DIR}/RimeIcon.iconset -o ${BUNDLE_RESOURCES_DIR}/RimeIcon.icns
+)
+add_custom_target(RimeIcon.icns ALL DEPENDS ${BUNDLE_RESOURCES_DIR}/RimeIcon.icns)