Changeset 1749

Timestamp:

09/11/11 00:59:07 (7 months ago)

Author:

Freddie Akeroyd

Message:

Windows build fixes. Refs #281

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• Windows_extra/libNeXus-0-Win32.def (modified) (6 diffs)
• src/CMakeLists.txt (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -250 +250 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NX_CFLAGS}")
 
+if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+    set(ARCH64 1)
+else()
+    set(ARCH64 0)
+endif()
+
 # Recurse into the subdirectories.
 add_subdirectory (src)

trunk/Windows_extra/libNeXus-0-Win32.def

@@ -51 +51 @@
 NXMGetError
 NXMSetError
+NXMSetTError
 createNXDataset
 createTextNXDataset
@@ -66 +67 @@
 nxiclosegroup_
 nxicompmakedata_
+nxicompmakedata64_
 nxicompress_
 nxifclose_
@@ -83 +85 @@
 nxigetgroupinfo_
 nxigetrawinfo_
+nxigetrawinfo64_
 nxigetinfo_
+nxigetinfo64_
 nxigetnextattr_
 nxigetnextentry_
 nxigetslab_
+nxigetslab64_
 nxiinitattrdir_
 nxiinitgroupdir_
@@ -93 +98 @@
 nxilinkexternal_
 nximakedata_
+nximakedata64_
 nximakegroup_
 nximakelink_
 nximakenamedlink_
 nximalloc_
+nximalloc64_
 nxiopen_
 nxiopendata_
@@ -106 +113 @@
 nxiputdata_
 nxiputslab_
+nxiputslab64_
 nxisameid_
 nxisetcache_
@@ -112 +120 @@
 putNXDatasetValueAt
 nxigetpath_
+nxilinkexternaldataset_
+nxiisexternaldataset_
+nxireopen_

trunk/src/CMakeLists.txt

@@ -41 +41 @@
 # need napi_exports2.c  on win32 but not win64
 if (WIN32)
-    set(NAPISRC ${NAPISRC} napi_exports.c napi_exports.h)
+    if (CMAKE_CL_64)
+        set(NAPISRC ${NAPISRC} napi_exports2.c napi_exports.h)
+    else()
+        set(NAPISRC ${NAPISRC} napi_exports.c napi_exports2.c napi_exports.h)
+        endif()
 endif (WIN32)
+
 
 set (NAPISRC ${NAPISRC} nxxml.c nxio.c nxio.h)
@@ -82 +87 @@
 set_property(TARGET NeXus_Shared_Library APPEND PROPERTY COMPILE_DEFINITIONS _HDF5USEDLL_)
 
+if (CMAKE_CL_64)
+   set(DEF_FILE ${PROJECT_SOURCE_DIR}/Windows_extra/libNeXus-0-x64.def)
+else()
+   set(DEF_FILE ${PROJECT_SOURCE_DIR}/Windows_extra/libNeXus-0-Win32.def)
+endif()
+
 #Note - library version needs to be got from somewhere?
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set_target_properties(NeXus_Shared_Library PROPERTIES OUTPUT_NAME libNeXus-0
                       VERSION 1.0 SOVERSION 4 )
-        set_property(TARGET NeXus_Shared_Library APPEND PROPERTY LINK_FLAGS /def:${PROJECT_SOURCE_DIR}/Windows_extra/libNeXus-0-x64.def)
+        set_property(TARGET NeXus_Shared_Library APPEND PROPERTY LINK_FLAGS /def:${DEF_FILE})
 else(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set_target_properties(NeXus_Shared_Library PROPERTIES OUTPUT_NAME NeXus