diff --git a/build.cfg b/build.cfg index e712285a..045235e3 100644 --- a/build.cfg +++ b/build.cfg @@ -32,8 +32,8 @@ py_table_sha256 = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c ## https://github.com/boostorg/boost/releases boost--cmake.tar.xz # boost -boost_version = 1.87.0 -boost_sha256 = 7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5 +boost_version = 1.89.0 +boost_sha256 = 67acec02d0d118b5de9eb441f5fb707b3a1cdd884be00ca24b9a73c995511f74 ## https://github.com/fcitx/libime-jyutping/blob/master/data/CMakeLists.txt # jyutping dict diff --git a/src/Base.hs b/src/Base.hs index 19a2409e..d4a8e2bc 100644 --- a/src/Base.hs +++ b/src/Base.hs @@ -119,7 +119,7 @@ getSdkCMake :: AndroidEnv -> FilePath getSdkCMake AndroidEnv {..} = sdkRoot "cmake" sdkCMakeVersion "bin" "cmake" getSdkNinja :: AndroidEnv -> FilePath -getSdkNinja AndroidEnv {..} = sdkRoot "cmake" sdkCMakeVersion "bin" +getSdkNinja AndroidEnv {..} = sdkRoot "cmake" sdkCMakeVersion "bin" "ninja" getABIList :: AndroidEnv -> [String] getABIList AndroidEnv {..} = split (== ',') abi diff --git a/src/CMakeBuilder.hs b/src/CMakeBuilder.hs index c697e9f2..cbfbc256 100644 --- a/src/CMakeBuilder.hs +++ b/src/CMakeBuilder.hs @@ -113,13 +113,14 @@ useCMake CmakeBuilder {..} = addOracle $ \(WithAndroidEnv q env) -> do let cmakeEnvOptions = [AddEnv k v | (k, v) <- cmakeEnv bEnv] cmd_ (Cwd src) - (AddPath [] [ninja]) cmakeEnvOptions cmake "-B" buildEnvBuildDir - "-GNinja" + "-G" + "Ninja" ( [ "-DCMAKE_TOOLCHAIN_FILE=" <> toolchain, + "-DCMAKE_MAKE_PROGRAM=" <> ninja, "-DANDROID_ABI=" <> a, "-DANDROID_PLATFORM=" <> show (platform env), "-DANDROID_STL=c++_shared",