COMP: Make some relative paths absolute paths (HDF5, LIBXML, H5DSM Lib Dirs)

core/CMakeLists.txt

@@ -33,28 +33,27 @@ if(HDF5_FOUND)
   mark_as_advanced(FORCE HDF5_C_INCLUDE_DIR)
   mark_as_advanced(FORCE HDF5_hdf5_LIBRARY_DEBUG)
   mark_as_advanced(FORCE HDF5_hdf5_LIBRARY_RELEASE)
-  include_directories(${HDF5_INCLUDE_DIR})
   include_directories(${HDF5_INCLUDE_DIRS})
-  get_filename_component(HDF5_LIBRARY_DIR "${HDF5_hdf5_LIBRARY_RELEASE}" 
-    PATH)
-  set(XDMF_LIBRARY_DIRS ${XDMF_LIBRARY_DIRS}
-	${HDF5_LIBRARY_DIR})
+  get_filename_component(HDF5_LIBRARY_DIR "${HDF5_hdf5_LIBRARY_RELEASE}" PATH)
+  set(XDMF_LIBRARY_DIRS ${XDMF_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR})
   set(HDF5_LIBRARIES ${HDF5_hdf5_LIBRARY_RELEASE})
-  option(HDF5_IS_PARALLEL "Whether or not HDF5 has parallel IO support." OFF)
+  # FIXME: Would like to get this info from HDF5 so we don't have conflicting
+  # MPI versions
   if(HDF5_IS_PARALLEL)
     find_package(MPI REQUIRED)
     if(MPI_FOUND)
       include_directories(${MPI_INCLUDE_PATH})
-      set(XDMF_LIBRARY_DIRS ${XDMF_LIBRARY_DIRS}
-		${MPI_INCLUDE_PATH}/../lib)
+      get_filename_component(MPI_LIBRARY_DIR ${MPI_LIBRARY} PATH)
+      set(XDMF_LIBRARY_DIRS ${XDMF_LIBRARY_DIRS} ${MPI_LIBRARY_DIR})
     endif(MPI_FOUND)
     option(XDMF_BUILD_DSM OFF)
     if(XDMF_BUILD_DSM)
       find_package(H5FDdsm REQUIRED NO_MODULE)
       if(H5FDdsm_FOUND)
         include_directories(${H5FD_DSM_INCLUDE_DIR})
-	    set(XDMF_LIBRARY_DIRS ${XDMF_LIBRARY_DIRS} 
-	      ${H5FD_DSM_INCLUDE_DIR}/../lib)
+        get_filename_component(H5FD_DSM_LIBRARY_DIR 
+                               "${H5FD_DSM_INCLUDE_DIR}/../lib" REALPATH)
+	set(XDMF_LIBRARY_DIRS ${XDMF_LIBRARY_DIRS} ${H5FD_DSM_LIBRARY_DIR})
         get_property(h5fddsm_lib_location TARGET H5FDdsm PROPERTY LOCATION)
         set(H5FD_DSM_LIBRARIES ${h5fddsm_lib_location})
       else(H5FDdsm_FOUND)
@@ -68,7 +67,6 @@ if(HDF5_FOUND)
   set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${HDF5_LIBRARIES} ${H5FD_DSM_LIBRARIES})
   set(XDMF_HDF5_BINARY_DIRS ${HDF5_BINARY_DIRS} PARENT_SCOPE)
   set(XDMF_BINARIES ${XDMF_BINARIES} ${HDF5_BINARY_DIRS})
-  link_directories(${XDMF_LIBRARY_DIRS})
 endif(HDF5_FOUND)
 
 find_package(LibXml2 REQUIRED)