Fix MSVC builds

Author: tresf

CMakeLists.txt

@@ -68,7 +68,7 @@ list(APPEND JSSC_ADDITIONAL_INCLUDES target/nar/javah-include/)
 # linux, macos, etc
 string(TOLOWER "${CMAKE_SYSTEM_NAME}" OS_NAME)
 if(APPLE)
-	# scijava expects "osx", not "darwin"
+	# See <native.lib.directory> in pox.xml
 	set(OS_NAME "osx")
 endif()
 

pom.xml

@@ -19,6 +19,8 @@
     <cmake.download.binaries>false</cmake.download.binaries>
     <!-- cmake maven plugin -->
     <cmake.classifier>linux-x86_64</cmake.classifier>
+	<!--FIXME "Makefiles" parameter MUST be optional see cmake-maven-project/cmake-maven-project#7 -->
+	<cmake.generator>Unix Makefiles</cmake.generator>
     <!-- native lib loader (dependency) -->
     <native.lib.directory>linux_64</native.lib.directory>
   </properties>
@@ -87,8 +89,8 @@
             <configuration>
               <sourcePath>${project.basedir}</sourcePath>
               <targetPath>${project.build.directory}/cmake</targetPath>
-              <!--FIXME "Makefiles" should be optional see cmake-maven-project/cmake-maven-project#7 -->
-              <generator>Unix Makefiles</generator>
+              <!--FIXME "Makefiles" parameter MUST be optional see cmake-maven-project/cmake-maven-project#7 -->
+              <generator>${cmake.generator}</generator>
               <!--TODO Use -DCMAKE_TOOLCHAIN_FILE file for cross-compile
               <options>
                 <option>-DCMAKE_TOOLCHAIN_FILE=toolchain/Mingw64.cmake</option>
@@ -160,11 +162,11 @@
         </os>
       </activation>
       <properties>
-        <cmake.download.binaries>true</cmake.download.binaries>
+        <cmake.root.dir>${env.PROGRAMFILES}/CMake</cmake.root.dir>
+        <!--FIXME "Makefiles" parameter MUST be optional see cmake-maven-project/cmake-maven-project#7 -->
+        <cmake.generator>Visual Studio 14 2015</cmake.generator>
         <cmake.classifier>windows-x86_64</cmake.classifier>
         <native.lib.directory>windows_64</native.lib.directory>
-        <cmake.root.dir />
-        <cmake.child.dir />
       </properties>
     </profile>
 

src/cpp/_nix_based/jssc.cpp

@@ -52,7 +52,7 @@
  * Get native library version
  */
 JNIEXPORT jstring JNICALL Java_jssc_SerialNativeInterface_getNativeLibraryVersion(JNIEnv *env, jobject object) {
-    return env->NewStringUTF("2.8.1");
+    return env->NewStringUTF("FIXME" /* FIXME: jSSC_NATIVE_LIB_VERSION missing */);
 }
 
 /* OK */

src/cpp/windows/jssc.cpp

@@ -25,7 +25,7 @@
 #include <jni.h>
 #include <stdlib.h>
 #include <windows.h>
-#include "../jssc_SerialNativeInterface.h"
+#include <jssc_SerialNativeInterface.h>
 
 //#include <iostream>
 
@@ -35,7 +35,7 @@
  * Get native library version
  */
 JNIEXPORT jstring JNICALL Java_jssc_SerialNativeInterface_getNativeLibraryVersion(JNIEnv *env, jobject object) {
-    return env->NewStringUTF(jSSC_NATIVE_LIB_VERSION);
+    return env->NewStringUTF("FIXME" /* FIXME: jSSC_NATIVE_LIB_VERSION missing */);
 }
 
 /*