Fix library linking on Windows

Static libraries need a different name to avoid
clash with DLL import library

Import library now installed

Add DLL export symbols file

Author: FreddieAkeroyd

CMakeLists.txt

@@ -51,12 +51,14 @@ add_custom_target(html)
 if(CMAKE_HOST_UNIX)
     #easy on Unix - just follow the GNU standard
     include(GNUInstallDirs)
+	set(STATIC_LIBRARY_SUFFIX "")
 else()
     set(CMAKE_INSTALL_LIBDIR lib)
     set(CMAKE_INSTALL_DOCDIR doc)
     set(CMAKE_INSTALL_INCLUDEDIR include)
     set(CMAKE_INSTALL_MANDIR man)
     set(CMAKE_INSTALL_BINDIR bin)
+	set(STATIC_LIBRARY_SUFFIX "Static")
 endif() 
 
 

bindings/cpp/CMakeLists.txt

@@ -38,7 +38,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)
+                      OUTPUT_NAME NeXusCPP${STATIC_LIBRARY_SUFFIX})
 
 target_link_libraries(NeXus_CPP_Static_Library NeXus_Static_Library)
 
@@ -51,9 +51,13 @@ set_target_properties(NeXus_CPP_Shared_Library PROPERTIES
                       VERSION "${ABI_VERSION}"
                       SOVERSION ${ABI_CURRENT})
 
-install (TARGETS NeXus_CPP_Static_Library NeXus_CPP_Shared_Library
+install (TARGETS NeXus_CPP_Shared_Library
+         RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
+
+install (TARGETS NeXus_CPP_Static_Library 
          DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime )
+         COMPONENT Development)
 
 INSTALL (FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nexus  
          COMPONENT Development)

src/CMakeLists.txt

@@ -37,12 +37,9 @@ endif (WIN32)
 # generate list of common source files
 #-----------------------------------------------------------------------------
 set (NAPISRC napi.c napiu.c nxstack.c nxstack.h stptok.c  nxdataset.c 
+             napi_fortran_helper.c
              nxdataset.h nx_stptok.h)
 
-if (ENABLE_FORTRAN90 OR ENABLE_FORTRAN77)
-  set (NAPISRC ${NAPISRC} napi_fortran_helper.c)
-endif(ENABLE_FORTRAN90 OR ENABLE_FORTRAN77)
-
 set (NAPILINK)
 
 #-----------------------------------------------------------------------------
@@ -80,7 +77,7 @@ set_property(SOURCE ${NAPISRC} APPEND PROPERTY COMPILE_FLAGS ${NX_CFLAGS})
 add_library (NeXus_Static_Library STATIC ${NAPISRC})
 
 set_target_properties(NeXus_Static_Library PROPERTIES 
-                      OUTPUT_NAME NeXus)
+                      OUTPUT_NAME NeXus${STATIC_LIBRARY_SUFFIX})
 
 target_link_libraries(NeXus_Static_Library ${NAPI_LINK_LIBS})
 #------------------------------------------------------------------------------
@@ -92,6 +89,10 @@ set_target_properties(NeXus_Shared_Library PROPERTIES
                       OUTPUT_NAME NeXus
                       VERSION ${ABI_VERSION}
                       SOVERSION ${ABI_CURRENT})
+if(MSVC)
+set_target_properties(NeXus_Shared_Library PROPERTIES LINK_FLAGS 
+                           "/DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/NeXus.def\"")
+endif(MSVC)
 
 target_link_libraries(NeXus_Shared_Library ${NAPI_LINK_LIBS})
 
@@ -100,8 +101,8 @@ target_link_libraries(NeXus_Shared_Library ${NAPI_LINK_LIBS})
 # install the targets
 #-----------------------------------------------------------------------------
 install (TARGETS NeXus_Shared_Library
-         DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT Runtime)
+         RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
 
 install (TARGETS NeXus_Static_Library 
          DESTINATION ${CMAKE_INSTALL_LIBDIR}

src/NeXus.def

@@ -0,0 +1,84 @@
+LIBRARY NeXus.dll
+EXPORTS
+NXIReportError
+NXIprintlink
+NXMDisableErrorReporting
+NXMEnableErrorReporting
+NXMGetError
+NXMSetError
+NXMSetTError
+createNXDataset
+createTextNXDataset
+dropNXDataset
+getNXDatasetByteLength
+getNXDatasetDim
+getNXDatasetLength
+getNXDatasetRank
+getNXDatasetText
+getNXDatasetType
+getNXDatasetValue
+getNXDatasetValueAt
+nxiclose_
+nxiclosedata_
+nxiclosegroup_
+nxicompmakedata_
+nxicompmakedata64_
+nxicompress_
+nxifclose_
+nxifcompmakedata_
+nxifcompress_
+nxifflush_
+nxiflush_
+nxifmakedata_
+nxifopen_
+nxifputattr_
+nxifree_
+nxigetattr_
+nxigetattrinfo_
+nxigetdata_
+nxigetdataid_
+nxigetgroupid_
+nxigetgroupinfo_
+nxigetrawinfo_
+nxigetrawinfo64_
+nxigetinfo_
+nxigetinfo64_
+nxigetnextattr_
+nxigetnextentry_
+nxigetslab_
+nxigetslab64_
+nxiinitattrdir_
+nxiinitgroupdir_
+nxiinquirefile_
+nxiisexternalgroup_
+nxilinkexternal_
+nximakedata_
+nximakedata64_
+nximakegroup_
+nximakelink_
+nximakenamedlink_
+nximalloc_
+nximalloc64_
+nxiopen_
+nxiopendata_
+nxiopengroup_
+nxiopengrouppath_
+nxiopenpath_
+nxiopensourcegroup_
+nxiputattr_
+nxiputdata_
+nxiputslab_
+nxiputslab64_
+nxisameid_
+nxisetcache_
+nxisetnumberformat_
+putNXDatasetValue
+putNXDatasetValueAt
+nxigetpath_
+nxilinkexternaldataset_
+nxiisexternaldataset_
+nxireopen_
+nxiputattra_
+nxigetnextattra_
+nxigetattra_
+nxigetattrainfo_