Changeset 1629

Timestamp:

18/08/11 19:19:06 (9 months ago)

Author:

Freddie Akeroyd

Message:

Updates for cmake building on win64. Refs #281

Location:

trunk

Files:

• bindings/CMakeLists.txt (modified) (1 diff, 1 prop)
• cmake_include/FindSZIP.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (2 diffs)
• third_party/README.txt (added)

trunk/bindings/CMakeLists.txt

@@ -33 +33 @@
 endif (CMAKE_Fortran_COMPILER_WORKS)
 #add_subdirectory (idl)
-add_subdirectory (java)
+if (NOT(Java_JAVAC_EXECUTABLE MATCHES NOTFOUND))
+    add_subdirectory (java)
+endif ()
 #add_subdirectory (matlab)
 if (PYTHONINTERP_FOUND)

trunk/cmake_include/FindSZIP.cmake

@@ -27 +27 @@
 #====================================================================
 
-find_library(SZIP_LIB NAMES sz szip PATHS $ENV{HDF5_ROOT}/bin $ENV{HDF5_ROOT}/lib)
+find_library(SZIP_LIB NAMES sz szip PATHS $ENV{HDF5_ROOT}/bin $ENV{HDF5_ROOT}/lib $ENV{HDF5_ROOT}/dll)
 
 find_path(SZIP_INCLUDE NAMES sz.h szlib.h PATHS $ENV{HDF5_ROOT}/include)

trunk/src/CMakeLists.txt

@@ -58 +58 @@
 #endif (MINGW_MSYS)
 
+# need napi_exports2.c  on win32 but not win64
+if (WIN32)
+    set(WINSRC napi_exports.c napi_exports.h)
+endif (WIN32)
+
 #Make NeXus Static Library
-
 add_library (NeXus_Static_Library STATIC napi.c napiu.c nxstack.c nxstack.h
-             stptok.c  nxdataset.c nxdataset.h nx_stptok.h ${H4SRC} ${H5SRC}
+             stptok.c  nxdataset.c nxdataset.h nx_stptok.h ${WINSRC} ${H4SRC} ${H5SRC}
              ${XMLSRC})
 
@@ -73 +77 @@
 
 add_library (NeXus_Shared_Library SHARED napi.c napiu.c nxstack.c nxstack.h
-             stptok.c  nxdataset.c nxdataset.h nx_stptok.h ${H4SRC} ${H5SRC}
+             stptok.c  nxdataset.c nxdataset.h nx_stptok.h ${WINSRC} ${H4SRC} ${H5SRC}
              ${XMLSRC})
 
 #Note - library version needs to be got from somewhere?
 set_target_properties(NeXus_Shared_Library PROPERTIES OUTPUT_NAME NeXus
-                      VERSION 1.0 SOVERSION 4)
+                      VERSION 1.0 SOVERSION 4 LINK_FLAGS /def:${PROJECT_SOURCE_DIR}\\windows_extra\\libnexus-0-x64.def)
 
 target_link_libraries(NeXus_Shared_Library ${HDF5_LIBRARIES}