diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-03-17 18:59:19 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-03-17 18:59:19 (GMT) |
| commit | e5d4692a97f4b28d97b7bd555da51b8571ee76e5 (patch) | |
| tree | 1846f4408df49e49568dbdb76931596f7ee32dc0 /config | |
| parent | 17f78f8469fca0787aa9ef8fbed07d55b0ee4510 (diff) | |
| download | hdf5-e5d4692a97f4b28d97b7bd555da51b8571ee76e5.zip hdf5-e5d4692a97f4b28d97b7bd555da51b8571ee76e5.tar.gz hdf5-e5d4692a97f4b28d97b7bd555da51b8571ee76e5.tar.bz2 | |
[svn-r26465] Merge back from DB branch; cmake defaults and compressed examples
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/README.txt.cmake.in | 8 | ||||
| -rw-r--r-- | config/cmake/cacheinit.cmake | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.txt.cmake.in index 4044ce5..b88fedf 100644 --- a/config/cmake/README.txt.cmake.in +++ b/config/cmake/README.txt.cmake.in @@ -24,15 +24,15 @@ Installation After Installation =========================================================================== -The compressed examples file HDF5Examples-0.1.1-Source.@BINARY_EXAMPLE_ENDING@, located in the +The examples folder, HDF5Examples, located in the HDF5 install folder, can be built and tested with CMake and the supplied HDF518_Examples.cmake file. The HDF518_Examples.cmake expects HDF5 to have -been installed in the default location with above compilers. Also, CMake and 7Zip -utilities should be installed. +been installed in the default location with above compilers. Also, the CMake +utility should be installed. To test the installation with the examples; Create a directory to run the examples. - Copy HDF5Examples-0.1.1-Source.@BINARY_EXAMPLE_ENDING@ to this directory, do NOT unzip. + Copy HDF5Examples-0.1.1-Source folder to this directory, do NOT unzip. Copy HDF518_Examples.cmake to this directory. Edit HDF518_Examples.cmake line 8 to set INSTALLDIR to where HDF5 is installed. (The default should be correct unless you installed into a different folder.) diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index e68afe6..a18395f 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -10,10 +10,6 @@ set (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE) set (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE) -set (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE) - -set (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE) - set (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE) set (HDF5_ENABLE_F2003 ON CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE) |