Merge branch 'master' of https://github.com/nexusformat/code

Author: eugenwintersberger

.gitignore

@@ -12,7 +12,8 @@ Makefile
 cmake_install.cmake
 install_manifest.txt
 
-
+# Ignore usual in-tree CMake build area
+/build/
 
 # Compiled Object files
 *.slo

CMakeLists.txt

@@ -51,7 +51,13 @@ add_custom_target(html)
 if(CMAKE_HOST_UNIX)
     #easy on Unix - just follow the GNU standard
     include(GNUInstallDirs)
-endif()
+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)
+endif() 
 
 
 #-----------------------------------------------------------------------------

README.rst

@@ -124,3 +124,34 @@ programs (if configured to build them). To build the API documentation use
 
     $ make html
     $ make install-html
+
+Building the code on Windows
+============================
+
+These instructions will build everything except the applications using LIBXML2 (e.g. nxtranslate)
+
+* Download and install HDF4 and/or HDF5 libraries from HDF web site
+
+  - within these installations is a "cmake" directory, I needed to remove/rename this to get everything to configure properly
+
+* Download MXML source from http://www.msweet.org/projects.php?Z3
+
+  - open the vcnet directory
+  - you need to edit mxml1.def and a add a single line containing the text    mxml_error   to the end of this file
+  - open the visual studio solution and build the project
+  - copy the files mxml.h mxml1.lib mxml1.dll to some other location
+
+* Define HDF4_ROOT, HDF5_ROOT and MXML_ROOT environment variables to point to the top of each installed area
+
+  - you should use / rather than \\ for the paths specified in these variables
+
+* Create an empty build directory somewhere - this can be within your nexus source tree
+* Run CMAKE-GUI to generate Visual studio solutions files
+
+  - Provide source and build paths in the relevant boxes
+  - Click on Configure, choose appropriate visual studio version when prompted
+  - A list of options will appear, choose the appropriate ENABLE_ ones and press Configure again
+  - If nothing is red, click on Generate
+
+* Browse to the build directory and open the generated NeXus.sln
+* Build the solution

bindings/cpp/CMakeLists.txt

@@ -55,7 +55,7 @@ install (TARGETS NeXus_CPP_Static_Library NeXus_CPP_Shared_Library
          DESTINATION ${CMAKE_INSTALL_LIBDIR}
          COMPONENT Runtime )
 
-INSTALL (FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
+INSTALL (FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nexus  
          COMPONENT Development)
 
 

cmake_include/FindHDF4.cmake

@@ -25,18 +25,37 @@
 #
 #=============================================================================
 
+<<<<<<< HEAD
 find_library(HDF4_LIBRARIES NAMES df mfhdf PATH_SUFFIXES hdf)
 find_library(HDF4_DF_LIBRARY NAMES df PATH_SUFFIXES hdf)
 find_library(HDF4_MFHDF_LIBRARY NAMES mfhdf PATH_SUFFIXES hdf)
 message(STATUS "DF library found: ${HDF4_DF_LIBRARY}")
 message(STATUS "MFHDF library found: ${HDF4_MFHDF_LIBRARY}")
 
 message(STATUS "HDF4 libraries: ${HDF4_LIBRARIES}")
+=======
+set(HDF4_LIBRARIES df mfhdf)
 
-find_library(_HDF4_DF_LIBRARY NAMES df PATH_SUFFIXES hdf)
+#------------------------------------------------------------------------------
+# find the runtime binaries of the HDF4 library
+#------------------------------------------------------------------------------
+find_library(HDF4_LIBRARIES NAMES df mfhdf 
+             HINTS ENV HDF4_ROOT 
+             PATH_SUFFIXES hdf)
+
+find_library(_HDF4_DF_LIBRARY NAMES df hdf 
+             HINTS ENV 
+             HDF4_ROOT PATH_SUFFIXES hdf)
+>>>>>>> 336bba8dd4b92aa97c0684b1285f94d575b23f8a
+
+#if the binaries have been found their parent directory has to be 
+#extracted from the total path
 get_filename_component(HDF4_LIBRARY_DIRS ${_HDF4_DF_LIBRARY} PATH)
 
-find_path ( HDF4_INCLUDE_DIR mfhdf.h PATH /usr/include /usr/include/hdf)
+#------------------------------------------------------------------------------
+# find the HDF4 header file
+#------------------------------------------------------------------------------
+find_path (HDF4_INCLUDE_DIR mfhdf.h HINTS ENV HDF4_ROOT PATH_SUFFIXES hdf)
 
 include ( FindPackageHandleStandardArgs )
 find_package_handle_standard_args( HDF4 DEFAULT_MSG HDF4_LIBRARIES HDF4_INCLUDE_DIR )
@@ -55,6 +74,6 @@ find_package(JPEG REQUIRED)
 #------------------------------------------------------------------------------
 # add libraries to the link list for NAPI
 #------------------------------------------------------------------------------
-list(APPEND NAPI_LINK_LIBS  df mfhdf jpeg)
+list(APPEND NAPI_LINK_LIBS  ${_HDF4_DF_LIBRARY} mfhdf jpeg)
 include_directories ( SYSTEM ${HDF4_INCLUDE_DIR} )
 link_directories(${HDF4_LIBRARY_DIRS})

cmake_include/FindMXML.cmake

@@ -25,15 +25,27 @@
 #
 #==============================================================================
 
-find_module(MXML
-            LIB_NAMES mxml
-            HEADER_NAMES mxml.h
-            MOD_NAME mxml)
+
+if(CMAKE_HOST_UNIX)
+    find_module(MXML
+                LIB_NAMES mxml
+                HEADER_NAMES mxml.h
+                MOD_NAME mxml)
+else()
+    find_module(MXML
+                LIB_NAMES mxml mxml1
+                HEADER_NAMES mxml.h
+                MOD_NAME mxml)
+endif()
 
 if(NOT HAVE_MXML)
     #the user has explicitely requested to build with MXML - as we could not
     #find the library we have to exit the configuration
     message(FATAL_ERROR "User requested MXML not found!")
 endif()
 
-list(APPEND NAPI_LINK_LIBS mxml)
+if(CMAKE_HOST_UNIX)
+    list(APPEND NAPI_LINK_LIBS mxml)
+else()
+    list(APPEND NAPI_LINK_LIBS mxml mxml1)
+endif()

cmake_include/Utilities.cmake

@@ -125,7 +125,8 @@ endfunction()
 #     to look for the module. The name of the module is passed via the 
 #     MOD_NAME keywoard argument.
 # 3.) If no  pkg-config module is available, the function looks in the 
-#     default search paths. 
+#     default search paths. It can use the environment variable 
+#     ${MOD_NAME}_ROOT as a path hint.
 #
 # Arguments:
 #   Positional arguments: 
@@ -193,7 +194,7 @@ function(find_module VAR )
 
         #if pkg-config was not successful we have to do this the hard way
         if(NOT ${VAR}_FOUND)
-            find_library(${VAR}_LIBFILES NAME ${LIB_NAMES} PATHS)
+            find_library(${VAR}_LIBFILES NAME ${LIB_NAMES} PATHS ENV ${MOD_NAME}_ROOT)
             if(${${VAR}_LIBFILES} MATCHES "${VAR}_LIBFILES-NOTFOUND")
                 set(STATUS "Could not find ${VAR} runtime binaries!")
                 set(HAVE_${VAR} FALSE PARENT_SCOPE)
@@ -203,7 +204,7 @@ function(find_module VAR )
                 message(STATUS "${VAR} libraries: ${${VAR}_LIBFILES}")
             endif()
 
-            find_file(${VAR}_HDRFILES NAME ${HEADER_NAMES} PATHS)
+            find_file(${VAR}_HDRFILES NAME ${HEADER_NAMES} PATHS ENV ${MOD_NAME}_ROOT)
             if(${${VAR}_HDRFILES} MATCHES "${VAR}_HDRFILES-NOTFOUND")
                 message(STATUS "Could not find ${VAR} header files!")
                 set(HAVE_${VAR} FALSE PARENT_SCOPE)

include/CMakeLists.txt

@@ -31,4 +31,4 @@ SET(INCLUDE_FILES napi.h napiu.h)
 configure_file(nxconfig.h.in nxconfig.h @ONLY)
 
 INSTALL (FILES ${INCLUDE_FILES} 
-         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ COMPONENT Development)
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nexus  COMPONENT Development)

src/CMakeLists.txt

@@ -27,6 +27,12 @@
 
 add_definitions(-DIN_NEXUS_LIBRARY=1 ${NX_CPP})
 
+# this means a static nexus library will use a DLL HDF5. OK for now,
+# but may want to change later. 
+if (WIN32)
+add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB=1)
+endif (WIN32)
+
 #-----------------------------------------------------------------------------
 # generate list of common source files
 #-----------------------------------------------------------------------------

test/leak_test1.c

@@ -1,5 +1,7 @@
 #include <stdio.h>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <napi.h>