From e4be9eb098644688fbf90e862177e2c33c91259c Mon Sep 17 00:00:00 2001 From: Brad Miller Date: Sun, 6 Apr 2014 16:31:39 -0400 Subject: [PATCH] Added mvn profiles to define the cmake required properties depending on the build platform. Change-Id: Idc501cab1dfc87d364dd2e021d4e9cc52cd49196 --- cmake/pom.xml | 38 ++++++++++++++++++++++++++++++++--- wpilibj/wpilibJavaJNI/pom.xml | 36 ++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/cmake/pom.xml b/cmake/pom.xml index 1a5b375a21..6931d5747b 100644 --- a/cmake/pom.xml +++ b/cmake/pom.xml @@ -5,9 +5,41 @@ cpp-root 1.0.0 pom - - Unix Makefiles - + + + unix-properties + + Unix Makefiles + + + + unix + + + + + MAC-properties + + Unix Makefiles + + + + mac + + + + + windows-properties + + MSYS Makefiles + + + + windows + + + + diff --git a/wpilibj/wpilibJavaJNI/pom.xml b/wpilibj/wpilibJavaJNI/pom.xml index 064f5918eb..319a1dabf6 100644 --- a/wpilibj/wpilibJavaJNI/pom.xml +++ b/wpilibj/wpilibJavaJNI/pom.xml @@ -27,9 +27,43 @@ ${user.home}${file.separator}jdk-linux-arm-vfp-sflt${file.separator}jdk1.7.0_45 - Unix Makefiles ${embeddedJDKHome}${file.separator}include + + + unix-properties + + Unix Makefiles + + + + unix + + + + + MAC-properties + + Unix Makefiles + + + + mac + + + + + windows-properties + + MSYS Makefiles + + + + windows + + + +