diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-18 14:57:22 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-18 14:57:22 (GMT) |
commit | 6a9b816bde987f6ced009b0b1d1793e43103e013 (patch) | |
tree | 4b4bbc89768a4896c5fbd21bbe81084a8a84c2ef /examples | |
parent | aef900c6741aea851b218169648185b1c8e5e435 (diff) | |
parent | 601ae0ebbc2b766ebf2662315b3143b0f903d76b (diff) | |
download | hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.zip hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.tar.gz hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.tar.bz2 |
Merge pull request #861 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '601ae0ebbc2b766ebf2662315b3143b0f903d76b':
HDFFV-10392 change size of local array to 16 chars
HDFFV-10385 rework java names
HDFFV-10385 Use OUTPUT_NAME property instead of CMAKE_BUILD_TYPE
Revert CMAKE_BUILD_TYPE for matches - need to redesign
Diffstat (limited to 'examples')
-rw-r--r-- | examples/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 04a99ce..43c6d63 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -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,13 +59,11 @@ 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} ${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} ${MPI_C_LIBRARIES}) set_target_properties (ph5example-shared PROPERTIES FOLDER examples) |