Fixing randomness in the universe

Author: roigcarlo

applications/HDF5Application/CMakeLists.txt

@@ -139,19 +139,23 @@ if(${INSTALL_TESTING_FILES} MATCHES ON )
 endif(${INSTALL_TESTING_FILES} MATCHES ON)
 
 # Fix Windows paths
-file(TO_CMAKE_PATH "${HDF5_ROOT}/bin" HDF5_ROOT_DEP)
+file(TO_CMAKE_PATH "${HDF5_ROOT}/lib" HDF5_ROOT_DEP_LIB)
+file(TO_CMAKE_PATH "${HDF5_ROOT}/bin" HDF5_ROOT_DEP_BIN)
 
 # Install targets
 install(TARGETS KratosHDF5Core DESTINATION libs)
 install(TARGETS KratosHDF5Application DESTINATION libs)
 if(WIN32)
-    install(DIRECTORY "${HDF5_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.dll")
+    install(DIRECTORY "${HDF5_ROOT_DEP_LIB}/" DESTINATION libs FILES_MATCHING PATTERN "*.dll")
+    install(DIRECTORY "${HDF5_ROOT_DEP_BIN}/" DESTINATION libs FILES_MATCHING PATTERN "*.dll")
 endif()
 if(APPLE)
-    install(DIRECTORY "${HDF5_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.dylib")
+    install(DIRECTORY "${HDF5_ROOT_DEP_LIB}/" DESTINATION libs FILES_MATCHING PATTERN "*.dylib")
+    install(DIRECTORY "${HDF5_ROOT_DEP_BIN}/" DESTINATION libs FILES_MATCHING PATTERN "*.dylib")
 endif()
 if(UNIX AND NOT APPLE)
-    install(DIRECTORY "${HDF5_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.so*")
+    install(DIRECTORY "${HDF5_ROOT_DEP_LIB}/" DESTINATION libs FILES_MATCHING PATTERN "*.so*")
+    install(DIRECTORY "${HDF5_ROOT_DEP_BIN}/" DESTINATION libs FILES_MATCHING PATTERN "*.so*")
 endif()
 
 # Define custom targets

applications/MedApplication/CMakeLists.txt

@@ -77,22 +77,26 @@ if(${INSTALL_TESTING_FILES} MATCHES ON )
 endif(${INSTALL_TESTING_FILES} MATCHES ON)
 
 # Fix Windows paths
-file(TO_CMAKE_PATH "${HDF5_ROOT}/bin" HDF5_ROOT_DEP)
+file(TO_CMAKE_PATH "${HDF5_ROOT}/lib" HDF5_ROOT_DEP_LIB)
+file(TO_CMAKE_PATH "${HDF5_ROOT}/bin" HDF5_ROOT_DEP_BIN)
 file(TO_CMAKE_PATH "${MED_ROOT}/lib" MED_ROOT_DEP)
 
 # Install targets
 install(TARGETS KratosMedCore DESTINATION libs)
 install(TARGETS KratosMedApplication DESTINATION libs)
 if(WIN32)
-    install(DIRECTORY "${HDF5_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.dll")
+    install(DIRECTORY "${HDF5_ROOT_DEP_LIB}/" DESTINATION libs FILES_MATCHING PATTERN "*.dll")
+    install(DIRECTORY "${HDF5_ROOT_DEP_BIN}/" DESTINATION libs FILES_MATCHING PATTERN "*.dll")
     install(DIRECTORY "${MED_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.dll")
 endif()
 if(APPLE)
-    install(DIRECTORY "${HDF5_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.dylib")
+    install(DIRECTORY "${HDF5_ROOT_DEP_LIB}/" DESTINATION libs FILES_MATCHING PATTERN "*.dylib")
+    install(DIRECTORY "${HDF5_ROOT_DEP_BIN}/" DESTINATION libs FILES_MATCHING PATTERN "*.dylib")
     install(DIRECTORY "${MED_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.dylib")
 endif()
 if(UNIX AND NOT APPLE)
-    install(DIRECTORY "${HDF5_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.so*")
+    install(DIRECTORY "${HDF5_ROOT_DEP_LIB}/" DESTINATION libs FILES_MATCHING PATTERN "*.so*")
+    install(DIRECTORY "${HDF5_ROOT_DEP_BIN}/" DESTINATION libs FILES_MATCHING PATTERN "*.so*")
     install(DIRECTORY "${MED_ROOT_DEP}/" DESTINATION libs FILES_MATCHING PATTERN "*.so*")
 endif()