diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2018-06-07 16:30:08 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2018-06-07 16:30:08 (GMT) |
| commit | 551f15f8ae02ca9c995619b216121081eb07633e (patch) | |
| tree | 995de8be59b4d8524753eba6b542ce4039d54c79 /config/cmake/scripts/CTestScript.cmake | |
| parent | b8c6b68c35fa2be23ef488a1d81097ff3ed55000 (diff) | |
| parent | 664186b91d9198915baca4c6dca3f7b03695d316 (diff) | |
| download | hdf5-551f15f8ae02ca9c995619b216121081eb07633e.zip hdf5-551f15f8ae02ca9c995619b216121081eb07633e.tar.gz hdf5-551f15f8ae02ca9c995619b216121081eb07633e.tar.bz2 | |
Merge pull request #1106 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.8/master to 1.8/masterhdf5-1_8_21
* commit '664186b91d9198915baca4c6dca3f7b03695d316': (124 commits)
Commit HDF5 1.8.21 release version strings.
Update INSTALL and INSTALL_parallel files to remove references to ancient systems and add generic steps for building HDF5 on HPC clusters.
Update various INSTALL files for 1.8.21 release.
Add missing space and correct typo.
Modified a section for newly supported systems and compilers (vs. 1.8.20 release); Brought edits for tools bug fixes from 1.10.2 RELEASE.txt as we agreed with Allen.
It is my test under Larry's guidance.
Remove build directory which was unintentionally committed.
Updated MANIFEST
Switch default build mode to production. Update version to 1.8.21 in anticipation of release.
Fixed EED-319 Description: Added an html version for the C++ function mapping table and removed the single web page version. Updated cpp_doc_config to use the html file. Fixed some typos. Running "doxygen cpp_doc_config" successfully.
HDFFV-10473 fix HDFFV-10398 attribute location
Add missing C++ entries to RELEASE.txt.
pre1 release.
Add missing RELEASE.txt entries for C++.
Update Windows test machines
Fix soversion naming and update cmake scripts
Update version in RELEASE.txt. Correct merge errors from hdf5_1_8.
Fixed typos
Fixed typos
Fixed typos
...
Diffstat (limited to 'config/cmake/scripts/CTestScript.cmake')
| -rwxr-xr-x | config/cmake/scripts/CTestScript.cmake | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index 3cb9a5e..670196b 100755 --- a/config/cmake/scripts/CTestScript.cmake +++ b/config/cmake/scripts/CTestScript.cmake @@ -9,7 +9,7 @@ # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # -cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
########################################################
# This dashboard is maintained by The HDF Group
# For any comments please contact cdashhelp@hdfgroup.org
@@ -64,13 +64,6 @@ if (APPLE) set (ENV{CC} "${XCODE_CC}")
set (ENV{CXX} "${XCODE_CXX}")
- if (NOT NO_MAC_FORTRAN)
- # Shared fortran is not supported, build static
- set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
- else ()
- set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
- endif ()
-
set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
endif ()
|