Browse Source

Use CMake and Ninja(-build) on the host/container.

Yao Wei Tjong 姚伟忠 6 years ago
parent
commit
911bc14665
2 changed files with 2 additions and 2 deletions
  1. 1 1
      android/urho3d-lib/build.gradle.kts
  2. 1 1
      buildSrc/src/main/kotlin/UrhoCommon.kt

+ 1 - 1
android/urho3d-lib/build.gradle.kts

@@ -187,7 +187,7 @@ tasks {
         doLast {
         doLast {
             val buildTree = File(android.externalNativeBuild.cmake.buildStagingDirectory, "cmake/release/$docABI")
             val buildTree = File(android.externalNativeBuild.cmake.buildStagingDirectory, "cmake/release/$docABI")
             named<Exec>("makeDoc") {
             named<Exec>("makeDoc") {
-                // This is a hack - expect the first line to contain the path to the embedded CMake executable
+                // This is a hack - expect the first line to contain the path to the CMake executable
                 executable = File(buildTree, "build_command.txt").readLines().first().split(":").last().trim()
                 executable = File(buildTree, "build_command.txt").readLines().first().split(":").last().trim()
                 workingDir = buildTree
                 workingDir = buildTree
             }
             }

+ 1 - 1
buildSrc/src/main/kotlin/UrhoCommon.kt

@@ -29,7 +29,7 @@ val kotlinVersion = embeddedKotlinVersion
 
 
 const val androidToolsVersion = "3.5.0-alpha13"
 const val androidToolsVersion = "3.5.0-alpha13"
 const val bintrayVersion = "1.8.4"
 const val bintrayVersion = "1.8.4"
-const val cmakeVersion = "3.10.2"
+const val cmakeVersion = "3.14.5+"
 const val relinkerVersion = "1.3.1"
 const val relinkerVersion = "1.3.1"
 const val junitVersion = "4.12"
 const val junitVersion = "4.12"
 const val testEspressoVersion = "3.0.2"
 const val testEspressoVersion = "3.0.2"