diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2018-05-04 21:37:14 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2018-05-04 21:37:14 (GMT) |
| commit | 2ad049a6411923653365962c826cf59cf801d0d7 (patch) | |
| tree | e8f8441cf03001362edf75bae862ab5b4b93a658 /examples/CMakeLists.txt | |
| parent | 5f702f40b719a05bf2d271797179b368c5fd39c5 (diff) | |
| parent | cc2eea14f6a6532a201dde13af13353d4d73fd92 (diff) | |
| download | hdf5-2ad049a6411923653365962c826cf59cf801d0d7.zip hdf5-2ad049a6411923653365962c826cf59cf801d0d7.tar.gz hdf5-2ad049a6411923653365962c826cf59cf801d0d7.tar.bz2 | |
Merge pull request #1045 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.10/master to 1.10/masterhdf5-1_10_2
* commit 'cc2eea14f6a6532a201dde13af13353d4d73fd92': (1014 commits)
Commit release date changes.
Fix typo in INSTALL_Cygwin.txt
Update references and merge from 1_10
Corrected email address
Commit Barbara's INSTALL* file updates.
Commit Elena's RELEASE.txt edits and Les'/Lori's README.txt revision.
ommit Elena's RELEASE.txt edits and Les'/Lori's README.txt revision.
Remove stray '/'.
Add subdirectory for CMake-HDF5-1.10.2.zip.
Correct name of hl compile script
Add directory in release CMake...tar.gz file.
Minor edits in RELEASE.txt. Set version for HDF5 1.10.2 release.
release branch should not generate headers
Switch default build mode to production. Set version to 1.10.2-pre2..
HDFF5-1.10.2-pre1 releaseed. Add links for security bug fixes to RELEASE.txt.
Fix VS2017 binary readme
Couple fixes to the test routine for HDFFV-10425.
Add test and release info for the fix to HDFFV-10425 test failure with H5DOwrite_chunk.
Updated RELEASE.txt
Remove known probelem that was fixed.
...
Diffstat (limited to 'examples/CMakeLists.txt')
| -rw-r--r-- | examples/CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d8eb1a2..4da8405 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.2) +cmake_minimum_required (VERSION 3.10) PROJECT (HDF5_EXAMPLES) #----------------------------------------------------------------------------- @@ -46,13 +46,11 @@ set (examples foreach (example ${examples}) add_executable (${example} ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c) - TARGET_NAMING (${example} STATIC) TARGET_C_PROPERTIES (${example} STATIC " " " ") target_link_libraries (${example} ${HDF5_LIB_TARGET}) set_target_properties (${example} PROPERTIES FOLDER examples) if (BUILD_SHARED_LIBS) add_executable (${example}-shared ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c) - TARGET_NAMING (${example}-shared SHARED) TARGET_C_PROPERTIES (${example}-shared SHARED " " " ") target_link_libraries (${example}-shared ${HDF5_LIBSH_TARGET}) set_target_properties (${example}-shared PROPERTIES FOLDER examples) @@ -61,15 +59,13 @@ endforeach () if (H5_HAVE_PARALLEL) add_executable (ph5example ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c) - TARGET_NAMING (ph5example STATIC) TARGET_C_PROPERTIES (ph5example STATIC " " " ") - target_link_libraries (ph5example ${HDF5_LIB_TARGET}) + target_link_libraries (ph5example ${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES}) set_target_properties (ph5example PROPERTIES FOLDER examples) if (BUILD_SHARED_LIBS) add_executable (ph5example-shared ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c) - TARGET_NAMING (ph5example-shared SHARED) TARGET_C_PROPERTIES (ph5example-shared SHARED " " " ") - target_link_libraries (ph5example-shared ${HDF5_LIBSH_TARGET}) + target_link_libraries (ph5example-shared ${HDF5_LIBSH_TARGET} ${MPI_C_LIBRARIES}) set_target_properties (ph5example-shared PROPERTIES FOLDER examples) endif () endif () |