From c78fda9708ce48c116e59e3776ca0c2849d171da Mon Sep 17 00:00:00 2001 From: Patrice Freydiere Date: Mon, 2 May 2016 14:58:11 +0000 Subject: [PATCH] fix compile for linux --- build.gradle | 2 +- nativewrapper/build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 891b7d0..629b0dd 100644 --- a/build.gradle +++ b/build.gradle @@ -30,5 +30,5 @@ apply plugin:'distribution' } // we must have the binaries compiled for the java wrapper -//tasks.getByPath(':jfgdb:compileJava').dependsOn(tasks.getByPath(":nativewrapper:build")) +tasks.getByPath(':jfgdb:compileJava').dependsOn(tasks.getByPath(":nativewrapper:build")) diff --git a/nativewrapper/build.gradle b/nativewrapper/build.gradle index a253851..b99d6e5 100644 --- a/nativewrapper/build.gradle +++ b/nativewrapper/build.gradle @@ -16,7 +16,7 @@ def JAVA_HOME; -task checkEnv << { +// task checkEnv << { if (!System.getenv('ESRI_FILE_GDB_HOME')) throw new Exception("environment variable ESRI_FILE_GDB_HOME must be defined") @@ -28,7 +28,7 @@ task checkEnv << { if (!JAVA_HOME.exists()) throw Exception("folder " + JAVA_HOME + " does not exists"); -} +// } distributions { main { @@ -64,7 +64,6 @@ task checkEnv << { // targetPlatform "x86" // only available for windows targetPlatform "x64" - binaries.all { sources { cpp { @@ -75,6 +74,7 @@ task checkEnv << { } } + binaries.all { if (toolChain in VisualCpp) { cppCompiler.args "/Zi", "-I" + new File(ESRI_FILE_GDB_HOME, "include").getAbsolutePath(),