Changeset 1748

Timestamp:

09/11/11 00:28:51 (7 months ago)

Author:

Freddie Akeroyd

Message:

Windows build fixes. Refs #281

Location:

trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• bindings/cpp/CMakeLists.txt (modified) (1 diff)
• bindings/java/CMakeLists.txt (modified) (1 diff)
• test/napi_test.c (modified) (1 diff)

trunk/CMakeLists.txt

@@ -48 +48 @@
 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)
@@ -59 +60 @@
 
 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)
@@ -241 +246 @@
 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.

trunk/bindings/cpp/CMakeLists.txt

@@ -38 +38 @@
 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 

trunk/bindings/java/CMakeLists.txt

@@ -141 +141 @@
 
         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
         )
 

trunk/test/napi_test.c

@@ -28 +28 @@
 #include <stdlib.h>
 #include <string.h>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 #include "napi.h"
 #include "napiconfig.h"