diff --git a/.gitignore b/.gitignore index c74338aa32df4f2eaa32d9cd8a57ceea18d44d76..803272b9f7fd12da54fe9a07f401ab2b77143dda 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,9 @@ gradle/wrapper/gradle-wrapper.properties /.settings/org.eclipse.buildship.core.prefs /.settings/org.eclipse.jdt.core.prefs /bin/de +/CMakeCache.txt +/Makefile +/cmake_install.cmake + +# CMAKE +/CMakeFiles diff --git a/build.gradle b/build.gradle index cfc1d0300a12b009618b4ac992e4e1652096bc03..63b951acc50fc85fca97d18becc4e5af340c0799 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,14 @@ plugins { id 'org.ajoberstar.grgit' version '1.7.2' - //id 'fr.echoes.gradle.cpp' version '1.2.9' + id 'fr.echoes.gradle.cpp' version '1.2.9' + id 'maven' } +//Hacky woraround for conflicting task names with maven and cpp plugin +tasks.remove(install) + apply plugin: 'java' -apply plugin: 'maven' -//apply plugin: 'org.ajoberstar.grgit' + group = 'de.hhu.bcs' version = '0.0.1-SNAPSHOT' @@ -32,17 +35,33 @@ task cloneYoshikoCode { } } +task launchCMake(type: Exec, group: "init") { + logger.info("Executing CMAKE in directory:"+workingDir) + executable = "cmake" + args yoshikoDir +} + +compileCpp.dependsOn launchCMake + +cpp { + applicationType = "clibrary" + exec.with { + execPath = "echo" + compileCppExecPath = "make" + compileCppBaseArgs = ".." + compileCppExecWorkingDir = "build" + } +} + compileJava.dependsOn(cloneYoshikoCode) repositories { maven { url "http://code.cytoscape.org/nexus/content/repositories/snapshots/" } maven { url "http://code.cytoscape.org/nexus/content/repositories/releases/" } maven { url "http://repo.maven.apache.org/maven2" } - maven { url "https://plugins.gradle.org/m2/" } } - dependencies { compile group: 'org.osgi', name: 'org.osgi.core', version:'4.2.0' compile group: 'org.cytoscape', name: 'service-api', version:'3.5.0-RC2'