diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-02-24 16:27:36 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-02-24 16:27:36 (GMT) |
| commit | ccee75d3e900ccf6281ac2185c512f6591e567b9 (patch) | |
| tree | 2d9fa7573db1c12e296f465a95a6880c46a9e1d1 /release_docs/USING_HDF5_CMake.txt | |
| parent | 64e1513f43824b7acfe565721c9b6d17c4feb544 (diff) | |
| download | hdf5-ccee75d3e900ccf6281ac2185c512f6591e567b9.zip hdf5-ccee75d3e900ccf6281ac2185c512f6591e567b9.tar.gz hdf5-ccee75d3e900ccf6281ac2185c512f6591e567b9.tar.bz2 | |
Update docs and scripts for release
Diffstat (limited to 'release_docs/USING_HDF5_CMake.txt')
| -rw-r--r-- | release_docs/USING_HDF5_CMake.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt index 3d6094d..378298a 100644 --- a/release_docs/USING_HDF5_CMake.txt +++ b/release_docs/USING_HDF5_CMake.txt @@ -241,7 +241,7 @@ set (CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY}) #INSTALLDIR - HDF5 root folder #CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo #CTEST_SOURCE_NAME - name of source folder; HDF4Examples -#STATIC_LIBRARIES - Default is YES +#STATIC_ONLY - Default is YES #FORTRAN_LIBRARIES - Default is NO #JAVA_LIBRARIES - Default is NO ##NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac) @@ -265,10 +265,10 @@ endif () if (NOT DEFINED CTEST_SOURCE_NAME) set (CTEST_SOURCE_NAME "HDF5Examples") endif () -if (NOT DEFINED STATIC_LIBRARIES) - set (STATICLIBRARIES "YES") +if (NOT DEFINED STATIC_ONLY) + set (STATICONLYLIBRARIES "YES") else () - set (STATICLIBRARIES "NO") + set (STATICONLYLIBRARIES "NO") endif() if (NOT DEFINED FORTRAN_LIBRARIES) set (FORTRANLIBRARIES "NO") @@ -290,7 +290,7 @@ endif () # Adjust the following SET Commands as needed ############################################################################################################### if (WIN32) - if (${STATICLIBRARIES}) + if (${STATICONLYLIBRARIES}) set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF") endif () set (ENV{HDF5_DIR} "${INSTALLDIR}/cmake") @@ -298,7 +298,7 @@ if (WIN32) set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}") set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}") else (WIN32) - if (${STATICLIBRARIES}) + if (${STATICONLYLIBRARIES}) set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC") endif () set (ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake") |