Fixed some issues from the previous pull request

Author: eugenwintersberger

cmake_include/FindHDF4.cmake

@@ -27,12 +27,25 @@
 
 set(HDF4_LIBRARIES df mfhdf)
 
-find_library(HDF4_LIBRARIES NAMES df mfhdf HINTS ENV HDF4_ROOT 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)
 
-find_library(_HDF4_DF_LIBRARY NAMES df hdf HINTS ENV HDF4_ROOT PATH_SUFFIXES hdf)
+#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 HINTS ENV HDF4_ROOT)
+#------------------------------------------------------------------------------
+# 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 )

cmake_include/FindMXML.cmake

@@ -25,15 +25,27 @@
 #
 #==============================================================================
 
-find_module(MXML
-            LIB_NAMES mxml mxml1
-            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_LIBFILES})
+if(CMAKE_HOST_UNIX)
+    list(APPEND NAPI_LINK_LIBS mxml)
+else()
+    list(APPEND NAPI_LINK_LIBS mxml mxml1)
+endif()