diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2020-12-15 16:48:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 16:48:44 (GMT) |
| commit | a3795aa9d4c214431a16c937b1ab11850fe0214a (patch) | |
| tree | 58781123e308b6c3c75ae4b2707ec7410322dfaf | |
| parent | 4e24a95f942466126b2cab1954281e59c0af6943 (diff) | |
| download | hdf5-a3795aa9d4c214431a16c937b1ab11850fe0214a.zip hdf5-a3795aa9d4c214431a16c937b1ab11850fe0214a.tar.gz hdf5-a3795aa9d4c214431a16c937b1ab11850fe0214a.tar.bz2 | |
1.8 has extra fortran CMake option (#176)
* 1.8 has extra fortran CMake option
* Update license URL
| -rw-r--r-- | CMakeFilters.cmake | 2 | ||||
| -rw-r--r-- | CMakeInstallation.cmake | 2 | ||||
| -rw-r--r-- | CMakePlugins.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 2 | ||||
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index 9a0719f..97d8be1 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -5,7 +5,7 @@ # This file is part of HDF5. The full HDF5 copyright notice, including # terms governing use, modification, and redistribution, is contained in # the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +# distribution tree, or in https://www.hdfgroup.org/licenses. # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index d706204..1cce45e 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -5,7 +5,7 @@ # This file is part of HDF5. The full HDF5 copyright notice, including # terms governing use, modification, and redistribution, is contained in # the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +# distribution tree, or in https://www.hdfgroup.org/licenses. # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # diff --git a/CMakePlugins.cmake b/CMakePlugins.cmake index da8de42..16fb874 100644 --- a/CMakePlugins.cmake +++ b/CMakePlugins.cmake @@ -5,7 +5,7 @@ # This file is part of HDF5. The full HDF5 copyright notice, including # terms governing use, modification, and redistribution, is contained in # the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +# distribution tree, or in https://www.hdfgroup.org/licenses. # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index 007bc29..090524a 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -5,7 +5,7 @@ # This file is part of HDF5. The full HDF5 copyright notice, including # terms governing use, modification, and redistribution, is contained in # the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +# distribution tree, or in https://www.hdfgroup.org/licenses. # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 1e29643..dc5803b 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -241,7 +241,7 @@ set (_PKG_CONFIG_LIBS_PRIVATE) if (NOT ONLY_SHARED_LIBS) set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") endif () -if (BUILD_SHARED_LIBS) +if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") endif () |