Added support to detect newer versions of Visual Studio as candidates…

… for msbuild
fusesource · Apr 24, 2018 · a103c50 · a103c50
1 parent 6f891af
commit a103c50
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/hawtjni-maven-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java b/hawtjni-maven-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java
@@ -258,7 +258,9 @@ private void vsBasedBuild(File buildDir) throws CommandLineException, MojoExecut
                 if( vcinstalldir!=null ) {
                     if( vcinstalldir.contains("Microsoft Visual Studio 10") ||
                         vcinstalldir.contains("Microsoft Visual Studio 11") ||
-                        vcinstalldir.contains("Microsoft Visual Studio 12")
+                        vcinstalldir.contains("Microsoft Visual Studio 12") ||
+                        vcinstalldir.contains("Microsoft Visual Studio 14") ||
+                        vcinstalldir.contains("Microsoft Visual Studio\\2017")
                       ) {
                         useMSBuild = true;
                     }
@@ -286,8 +288,6 @@ private void vsBasedBuild(File buildDir) throws CommandLineException, MojoExecut
             }
         }
 
-
-
         File libFile=FileUtils.resolveFile(buildDir, "target/"+platform+"-"+configuration+"/lib/"+library.getLibraryFileName());
         if( !libFile.exists() ) {
             throw new MojoExecutionException("vcbuild did not generate: "+libFile);
@@ -318,7 +318,7 @@ private void configureBasedBuild(File buildDir) throws IOException, MojoExecutio
 
         File distDirectory = new File(buildDir, "target");
         File distLibDirectory = new File(distDirectory, "lib");
-		distLibDirectory.mkdirs();
+        distLibDirectory.mkdirs();
 
         if( autogen.exists() && !skipAutogen ) {
             if( (!configure.exists() && !CLI.IS_WINDOWS) || forceAutogen ) {