Allow the -Dplatform=xxx setting to be used when doing the actual nat…

…ive build
fusesource · Apr 26, 2017 · ef3437c · ef3437c
1 parent 0072848
commit ef3437c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java b/maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java
@@ -259,14 +259,15 @@ private void vsBasedBuild(File buildDir) throws CommandLineException, MojoExecut
         FileUtils.copyDirectoryStructureIfModified(packageDirectory, buildDir);
 
         Library library = new Library(name);
+        String libPlatform = this.platform != null ? this.platform : Library.getPlatform();
         String platform;
         String configuration="release";
-        if( "windows32".equals(library.getPlatform()) ) {
+        if( "windows32".equals(libPlatform) ) {
         	platform = "Win32";
-        } else if( "windows64".equals(library.getPlatform()) ) {
+        } else if( "windows64".equals(libPlatform) ) {
         	platform = "x64";
         } else {
-        	throw new MojoExecutionException("Usupported platform: "+library.getPlatform());
+        	throw new MojoExecutionException("Usupported platform: "+libPlatform);
         }
 
         boolean useMSBuild = false;