diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
commit | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (patch) | |
tree | 3b7ce8804ae917fd71e995a39b4ccb08d2aa7169 /tools/src/h5ls/CMakeLists.txt | |
parent | 156baee37112996291f9ff07760be047d0e03c76 (diff) | |
parent | 71b817038d8cd82163cf71119873b2ba65a2c81b (diff) | |
download | hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.zip hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.gz hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.bz2 |
merge and fix conflicts
Diffstat (limited to 'tools/src/h5ls/CMakeLists.txt')
-rw-r--r-- | tools/src/h5ls/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/src/h5ls/CMakeLists.txt b/tools/src/h5ls/CMakeLists.txt index f2470fb..ffbb1c7 100644 --- a/tools/src/h5ls/CMakeLists.txt +++ b/tools/src/h5ls/CMakeLists.txt @@ -7,6 +7,7 @@ project (HDF5_TOOLS_SRC_H5LS C) if (NOT ONLY_SHARED_LIBS) add_executable (h5ls ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c) target_include_directories (h5ls PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") + #target_compile_definitions(h5ls PRIVATE H5_TOOLS_DEBUG) TARGET_C_PROPERTIES (h5ls STATIC) target_link_libraries (h5ls PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5ls PROPERTIES FOLDER tools) @@ -18,6 +19,7 @@ endif () if (BUILD_SHARED_LIBS) add_executable (h5ls-shared ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c) target_include_directories (h5ls-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") + #target_compile_definitions(h5ls-shared PRIVATE H5_TOOLS_DEBUG) TARGET_C_PROPERTIES (h5ls-shared SHARED) target_link_libraries (h5ls-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_target_properties (h5ls-shared PROPERTIES FOLDER tools) |