diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-04-24 15:25:13 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-04-24 15:25:13 (GMT) |
| commit | b3c5284692093953132c6c8227e0980b670bf4ad (patch) | |
| tree | 84cc1f217108c4585586ffd6e74782cbe91734ed /tools/src/h5dump | |
| parent | fa829e322ed44a67e2b3f2d6adf1306ad794859b (diff) | |
| parent | f435ed67fa53ca35462a60f4025464465d7dc9d0 (diff) | |
| download | hdf5-b3c5284692093953132c6c8227e0980b670bf4ad.zip hdf5-b3c5284692093953132c6c8227e0980b670bf4ad.tar.gz hdf5-b3c5284692093953132c6c8227e0980b670bf4ad.tar.bz2 | |
Merge pull request #1038 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f435ed67fa53ca35462a60f4025464465d7dc9d0':
TRILABS-20 set a compiler name on all project commands
TRILABS-19 All c code INCLUDE_DIRECTORIES converted
TRILABS-19 Initial conversion of include_directories to targets
Diffstat (limited to 'tools/src/h5dump')
| -rw-r--r-- | tools/src/h5dump/CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/src/h5dump/CMakeLists.txt b/tools/src/h5dump/CMakeLists.txt index 1133218..6f74ac6 100644 --- a/tools/src/h5dump/CMakeLists.txt +++ b/tools/src/h5dump/CMakeLists.txt @@ -1,10 +1,5 @@ cmake_minimum_required (VERSION 3.10) -PROJECT (HDF5_TOOLS_SRC_H5DUMP) - -#----------------------------------------------------------------------------- -# Setup include Directories -#----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) +project (HDF5_TOOLS_SRC_H5DUMP C) # -------------------------------------------------------------------- # Add the h5dump executables @@ -14,6 +9,7 @@ add_executable (h5dump ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c ) +set_property(TARGET h5dump APPEND PROPERTY INCLUDE_DIRECTORIES "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR}") TARGET_C_PROPERTIES (h5dump STATIC " " " ") target_link_libraries (h5dump ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5dump PROPERTIES FOLDER tools) @@ -27,6 +23,7 @@ if (BUILD_SHARED_LIBS) ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c ) + set_property(TARGET h5dump-shared APPEND PROPERTY INCLUDE_DIRECTORIES "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR}") TARGET_C_PROPERTIES (h5dump-shared SHARED " " " ") target_link_libraries (h5dump-shared ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_target_properties (h5dump-shared PROPERTIES FOLDER tools) |