diff options
| author | lrknox <lrknox> | 2018-06-07 16:04:57 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2018-06-07 16:04:57 (GMT) |
| commit | 664186b91d9198915baca4c6dca3f7b03695d316 (patch) | |
| tree | 995de8be59b4d8524753eba6b542ce4039d54c79 /config/cmake/CTestScript.cmake | |
| parent | b8c6b68c35fa2be23ef488a1d81097ff3ed55000 (diff) | |
| parent | deab7b25af9026e8426c9d09718540605683a873 (diff) | |
| download | hdf5-664186b91d9198915baca4c6dca3f7b03695d316.zip hdf5-664186b91d9198915baca4c6dca3f7b03695d316.tar.gz hdf5-664186b91d9198915baca4c6dca3f7b03695d316.tar.bz2 | |
Merge branch 'hdf5_1_8_21' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into 1.8/master
Diffstat (limited to 'config/cmake/CTestScript.cmake')
| -rw-r--r-- | config/cmake/CTestScript.cmake | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake index c59b10c..0269ba8 100644 --- a/config/cmake/CTestScript.cmake +++ b/config/cmake/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) ######################################################## # For any comments please contact cdashhelp@hdfgroup.org # @@ -63,13 +63,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 () |