diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-03-05 16:48:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-03-05 16:48:32 (GMT) |
| commit | ece0ba0336d8e8a620af757833411eadbe068503 (patch) | |
| tree | d934b6d5275461cd1029ef055a488815d535e9e4 /config | |
| parent | 5a7ad19248277b9c448894b8984cdde4cc3924dd (diff) | |
| download | hdf5-ece0ba0336d8e8a620af757833411eadbe068503.zip hdf5-ece0ba0336d8e8a620af757833411eadbe068503.tar.gz hdf5-ece0ba0336d8e8a620af757833411eadbe068503.tar.bz2 | |
[svn-r26371] Update cmake mininum version
Update windows wix cpack process.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 | ||||
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 2 | ||||
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 4 | ||||
| -rw-r--r-- | config/cmake/patch.xml | 11 |
4 files changed, 14 insertions, 6 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index e82755d..a0704be 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -232,9 +232,6 @@ /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ #cmakedefine H5_HAVE_LIBDMALLOC @H5_HAVE_LIBDMALLOC@ -/* Define to 1 if you have the `lmpe' library (-llmpe). */ -#cmakedefine H5_HAVE_LIBLMPE @H5_HAVE_LIBLMPE@ - /* Define to 1 if you have the `m' library (-lm). */ #cmakedefine H5_HAVE_LIBM @H5_HAVE_LIBM@ diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 6f4d7ca..f7d9438 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) ############################################################################################################### # This script will build and run the examples from a compressed file # Execute from a command line: diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index baa18c0..ee9ed84 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype) +macro (H5_SET_LIB_OPTIONS libtarget libname libtype) set (LIB_OUT_NAME "${libname}") if (${libtype} MATCHES "SHARED") if (WIN32) @@ -28,4 +28,4 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype) endif (HDF5_BUILD_WITH_INSTALL_NAME) endif (APPLE) -ENDMACRO (H5_SET_LIB_OPTIONS) +endmacro (H5_SET_LIB_OPTIONS) diff --git a/config/cmake/patch.xml b/config/cmake/patch.xml new file mode 100644 index 0000000..70571c5 --- /dev/null +++ b/config/cmake/patch.xml @@ -0,0 +1,11 @@ +<CPackWiXPatch> + <CPackWiXFragment Id="CM_CP_libraries.bin.hdf5.dll"> + <Environment Id="PATH" + Name="PATH" + Value="[CM_DP_libraries.bin]" + Permanent="no" + Part="last" + Action="set" + System="yes"/> + </CPackWiXFragment> +</CPackWiXPatch> |