jna fix

CMakeLists.txt

@@ -831,6 +831,11 @@ IF(ENABLE_FSYNC)
   SET(USE_FSYNC ON)
 ENDIF()
 
+OPTION (ENABLE_JNA "Enable jna bug workaround." OFF)
+IF(ENABLE_JNA)
+  SET(JNA ON)
+ENDIF()
+
 # Linux specific large file support flags.
 # Modelled after check in CMakeLists.txt for hdf5.
 OPTION(ENABLE_LARGE_FILE_SUPPORT "Enable large file support." ON)

config.h.in.cmake

@@ -71,6 +71,7 @@ are set when opening a binary file on Windows. */
 #cmakedefine BUILD_V2 1
 #cmakedefine NO_NETCDF_2 1
 #cmakedefine USE_FSYNC 1
+#cmakedefine JNA 1
 #cmakedefine ENABLE_DOXYGEN 1
 #cmakedefine ENABLE_INTERNAL_DOCS 1
 #cmakedefine VALGRIND_TESTS 1

configure.ac

@@ -95,6 +95,19 @@ if test "x$enable_fsync" = xyes ; then
 AC_DEFINE([USE_FSYNC], [1], [if true, include experimental fsync code])
 fi
 
+# Temporary until JNA bug is fixed
+AC_MSG_CHECKING([if jna bug workaround is enabledd])
+AC_ARG_ENABLE([jna],
+              [AS_HELP_STRING([--enable-jna],
+                              [enable jna bug workaround])],
+				[],
+				[enable_jna=no])
+test "x$enable_jna" = xno || enable_jna=yes
+AC_MSG_RESULT($enable_jna)
+if test "x$enable_jna" = xyes ; then
+AC_DEFINE([JNA], [1], [if true, include jna bug workaround code])
+fi
+
 # Does the user want to run extra tests with valgrind?
 AC_MSG_CHECKING([whether extra valgrind tests should be run])	
 AC_ARG_ENABLE([valgrind-tests],

wjna

@@ -16,11 +16,13 @@ FLAGS="-DHDF5_DIR=${CPP}/cmake/hdf5 ${FLAGS}"
 FLAGS="-DENABLE_CONVERSION_WARNINGS=OFF ${FLAGS}"
 FLAGS="-DBUILD_UTILITIES=OFF ${FLAGS}"
 FLAGS="-DENABLE_EXAMPLES=OFF ${FLAGS}"
+FLAGS="-DENABLE_V2_API=OFF ${FLAGS}"
+FLAGS="-DENABLE_JNA=ON ${FLAGS}"
 
 rm -fr ./build
 mkdir build
 pushd build
-cmake -G"Visual Studio 8" ${FLAGS} ..
+cmake -G"Visual Studio 12" ${FLAGS} ..
 cmake --build . --config Release
 cmake --build . --target INSTALL
 popd