Several updates and new packages

This commit is contained in:
layman
2017-05-19 09:53:18 +02:00
parent 2d1b0a55dd
commit 32a2ecd537
28 changed files with 688 additions and 14 deletions
@@ -0,0 +1,20 @@
Make cmake properly disable fortran upon user requirments
--- ./CMakeLists.txt.orig 2016-07-01 15:28:57.139304608 +0300
+++ ./CMakeLists.txt 2016-07-01 15:34:22.295899455 +0300
@@ -8,10 +8,13 @@
INCLUDE(CheckLanguage)
CHECK_LANGUAGE(Fortran)
-IF(CMAKE_Fortran_COMPILER)
+OPTION (MEDFILE_BUILD_FORTRAN "Build fortran library" ON)
+IF(MEDFILE_BUILD_FORTRAN)
ENABLE_LANGUAGE(Fortran)
+ IF(NOT CMAKE_Fortran_COMPILER)
+ MESSAGE(FATAL_EROOR "Fortran support was requested but not found")
+ ENDIF()
ELSE()
- MESSAGE(STATUS "No Fortran support")
ENDIF()
## Version number
@@ -0,0 +1,19 @@
Fix wierd typedefs macroses in the header witch made swing to fail
diff --git a/include/H5public_extract.h.in b/include/H5public_extract.h.in
index ba07342..28318f4 100644
--- a/include/H5public_extract.h.in
+++ b/include/H5public_extract.h.in
@@ -28,9 +28,9 @@ extern "C" {
@HDF5_TYPEDEF_HID_T@
@HDF5_TYPEDEF_HSIZE_T@
-#typedef int herr_t;
-#typedef int hid_t;
-#typedef unsigned long long hsize_t;
+typedef int herr_t;
+typedef int hid_t;
+typedef unsigned long long hsize_t;
#ifdef __cplusplus
}