diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-04-20 11:55:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 11:55:05 (GMT) |
| commit | fc5c567fdce94765c9db904295ca8879a8e91752 (patch) | |
| tree | 91879906198b94a23324ed9fc6d989c981bfacda | |
| parent | d3384b2e8e5fafd9f3aa90e738ca18d5ddeeb3c1 (diff) | |
| download | hdf5-fc5c567fdce94765c9db904295ca8879a8e91752.zip hdf5-fc5c567fdce94765c9db904295ca8879a8e91752.tar.gz hdf5-fc5c567fdce94765c9db904295ca8879a8e91752.tar.bz2 | |
CMake no longer builds the C++ library by default (#555)
* Committing clang-format changes
* CMake no longer builds C++ library by default
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | config/cmake/cacheinit.cmake | 2 | ||||
| -rw-r--r-- | release_docs/INSTALL_CMake.txt | 2 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 7 |
4 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0771ac6..306f701 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1106,7 +1106,7 @@ endif () # Option to build HDF5 C++ Library #----------------------------------------------------------------------------- if (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++") - option (HDF5_BUILD_CPP_LIB "Build HDF5 C++ Library" ON) + option (HDF5_BUILD_CPP_LIB "Build HDF5 C++ Library" OFF) if (HDF5_BUILD_CPP_LIB) # check for unsupported options if (HDF5_ENABLE_PARALLEL) diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index fc85277..e423deb 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -21,6 +21,8 @@ set (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE) set (HDF_PACKAGE_NAMESPACE "hdf5::" CACHE STRING "Name for HDF package namespace (can be empty)" FORCE) +set (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build C++ support" FORCE) + set (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE) set (HDF5_INSTALL_MOD_FORTRAN "NO" CACHE STRING "Copy FORTRAN mod files to include directory (NO SHARED STATIC)" FORCE) diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index f42f780..6f30f45 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -734,7 +734,7 @@ BUILD_STATIC_EXECS "Build Static Executables" OFF BUILD_TESTING "Build HDF5 Unit Testing" ON ---------------- HDF5 Build Options --------------------- -HDF5_BUILD_CPP_LIB "Build HDF5 C++ Library" ON +HDF5_BUILD_CPP_LIB "Build HDF5 C++ Library" OFF HDF5_BUILD_EXAMPLES "Build HDF5 Library Examples" ON HDF5_BUILD_FORTRAN "Build FORTRAN support" OFF HDF5_BUILD_JAVA "Build JAVA support" OFF diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index edf39f8..359f222 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -49,6 +49,13 @@ New Features Configuration: ------------- + - CMake no longer builds the C++ library by default + + HDF5_BUILD_CPP_LIB now defaults to OFF, which is in line with the + Autotools build defaults. + + (DER - 2021/04/20) + - Removal of pre-VS2015 work-arounds HDF5 now requires Visual Studio 2015 or greater, so old work-around |