diff options
author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-03-12 17:07:51 (GMT) |
---|---|---|
committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-03-12 17:07:51 (GMT) |
commit | 48eaac202950cac1060499792d3a6faea20cc1ce (patch) | |
tree | e671814d2ab1cef5a1f440f3f84e3f0adee53c75 /CMakeLists.txt | |
parent | 0c3fc6836345e2b4f63a8f59ec7c3b13d7bf920b (diff) | |
parent | 64565f9771a50138e77a806d7ab330e3919c1847 (diff) | |
download | hdf5-48eaac202950cac1060499792d3a6faea20cc1ce.zip hdf5-48eaac202950cac1060499792d3a6faea20cc1ce.tar.gz hdf5-48eaac202950cac1060499792d3a6faea20cc1ce.tar.bz2 |
Merge branch 'develop' into hdf5_1_10_merge
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7dda17..5ac4c60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.3.2) +cmake_minimum_required (VERSION 3.10) PROJECT (HDF5 C CXX) #----------------------------------------------------------------------------- @@ -671,12 +671,6 @@ if (HDF5_ENABLE_THREADSAFE) endif () endif () -# ----------------------------------------------------------------------- -# wrapper script variables -# -#set (CFLAGS "${C_DEFINES}") -#set (CXXFLAGS "${CXX_DEFINES}") - #----------------------------------------------------------------------------- # Add the HDF5 Library Target to the build #----------------------------------------------------------------------------- @@ -806,11 +800,6 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for endif () endif () - # ----------------------------------------------------------------------- - # wrapper script variables - # -# set (FCFLAGS "${Fortran_DEFINES}") - add_subdirectory (fortran) if (HDF5_BUILD_HL_LIB) if (EXISTS "${HDF5_SOURCE_DIR}/hl/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/fortran") |