Windows build fixes. Refs nexusformat#281

git-svn-id: https://svn.nexusformat.org/code/trunk@1748 ff5d1e40-2be0-497f-93bd-dc18237bd3c7

Author: FreddieAkeroyd

CMakeLists.txt

@@ -47,7 +47,8 @@ endif (HDF5_SEARCH)
 
 set(HDF4_SEARCH "" CACHE PATH "Where to search for HDF4")
 
-find_package(HDF5 REQUIRED)
+#find_package(HDF5 REQUIRED)
+find_package(HDF5)
 find_package(JPEG)
 find_package(XMLRPC)
 #find_package(ZLIB)
@@ -58,12 +59,16 @@ find_package(TCL)
 find_package(LATEX)
 
 if (WIN32)
-    set(HDF5_STATIC_LIBRARIES ${HDF5_SEARCH}/lib/hdf5.lib )
-    set(HDF5_SHARED_LIBRARIES ${HDF5_SEARCH}/dll/hdf5dll.lib )
-    set(HDF4_STATIC_LIBRARIES ${HDF4_SEARCH}/lib/hd426.lib ${HDF4_SEARCH}/lib/hm426.lib )
-    set(HDF4_SHARED_LIBRARIES ${HDF4_SEARCH}/dll/hd426m.lib ${HDF4_SEARCH}/dll/hm426m.lib )
-	set(HDF4_CPP "-I\"${HDF4_SEARCH}/include\" -DHDF4")
-	set(HDF4_FOUND YES)
+    if (HDF5_SEARCH)
+        set(HDF5_STATIC_LIBRARIES ${HDF5_SEARCH}/lib/hdf5.lib )
+        set(HDF5_SHARED_LIBRARIES ${HDF5_SEARCH}/dll/hdf5dll.lib )
+    endif (HDF5_SEARCH)
+    if (HDF4_SEARCH)
+        set(HDF4_STATIC_LIBRARIES ${HDF4_SEARCH}/lib/hd426.lib ${HDF4_SEARCH}/lib/hm426.lib )
+        set(HDF4_SHARED_LIBRARIES ${HDF4_SEARCH}/dll/hd426m.lib ${HDF4_SEARCH}/dll/hm426m.lib )
+	    set(HDF4_CPP "-I\"${HDF4_SEARCH}/include\" -DHDF4")
+	    set(HDF4_FOUND YES)
+    endif (HDF4_SEARCH)
 	set(MXML_CPP "-DNXXML")
 else(WIN32)
     set(HDF5_STATIC_LIBRARIES ${HDF5_SEARCH}/lib/libhdf5.a )
@@ -241,6 +246,9 @@ file(WRITE ${CMAKE_SOURCE_DIR}/include/nxconfig.h "/*A dummy config*/")
 set(NX_CFLAGS "/W4 /wd4820 /wd4996")
 set(NX_CPP -D_CRT_SECURE_NO_WARNINGS)
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NX_CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NX_CFLAGS}")
+
 # Recurse into the subdirectories.
 add_subdirectory (src)
 add_subdirectory (bindings)

bindings/cpp/CMakeLists.txt

@@ -37,7 +37,7 @@ set_property(SOURCE ${SOURCES} APPEND PROPERTY COMPILE_FLAGS ${NX_CFLAGS})
 
 add_library (NeXus_CPP_Static_Library STATIC ${HEADERS} ${SOURCES})
 
-set_target_properties(NeXus_CPP_Static_Library PROPERTIES OUTPUT_NAME NeXusCPP)
+set_target_properties(NeXus_CPP_Static_Library PROPERTIES OUTPUT_NAME NeXusCPPStatic)
 
 target_link_libraries(NeXus_CPP_Static_Library NeXus_Static_Library 
 					${READLINE_LINK} ${M_LINK} ${DL_LINK} ${PTHREAD_LINK} ${DF_LINK}

bindings/java/CMakeLists.txt

@@ -140,7 +140,9 @@ if(DEFINED JAVA_COMPILE)
                       )
 
         INSTALL(TARGETS jnexus
-            LIBRARY DESTINATION lib COMPONENT Runtime ARCHIVE DESTINATION lib COMPONENT Runtime
+            RUNTIME DESTINATION bin COMPONENT Runtime
+			LIBRARY DESTINATION lib COMPONENT Runtime 
+			ARCHIVE DESTINATION lib COMPONENT Runtime
         )
 
         INSTALL(FILES ${JAR_ARCHIVE} DESTINATION lib COMPONENT Runtime)

test/napi_test.c

@@ -27,7 +27,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 #include "napi.h"
 #include "napiconfig.h"