Merge pull request #1199 from diorcety/jni_cmake_build

bluca · web-flow · commit 4b6c0677591e · 2019-09-24T09:10:08.000+01:00
Use cmake --build . instead of make
diff --git a/zproject_java.gsl b/zproject_java.gsl
@@ -182,7 +182,7 @@ task initCMake(type: Exec, dependsOn: 'generateJniHeaders') {
     commandLine "cmake", "."
 }
 task buildNative(type: Exec, dependsOn: 'initCMake') {
-    commandLine "make"
+    commandLine "cmake", "--build", "."
 }
 
 task copyLibs(type: Copy) {

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ task initCMake(type: Exec, dependsOn: 'generateJniHeaders') {`
`182`	`182`	`commandLine "cmake", "."`
`183`	`183`	`}`
`184`	`184`	`task buildNative(type: Exec, dependsOn: 'initCMake') {`
`185`		`- commandLine "make"`
	`185`	`+ commandLine "cmake", "--build", "."`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`task copyLibs(type: Copy) {`