mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit '347501aba2962691988e73ddb1b384397e507a80':
  Add another source property
  Update generated files commands and properties
This commit is contained in:
Allen Byrne 2016-09-20 15:42:52 -05:00
commit a796aa6487
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fortran/src/CMakeLists.txt
View File

@ -92,6 +92,8 @@ add_custom_command (
WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
DEPENDS H5match_types
)
set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5f90i_gen.h PROPERTIES GENERATED TRUE)
set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5fortran_types.F90 PROPERTIES GENERATED TRUE)
#-----------------------------------------------------------------------------
# f90CStub lib
@ -114,7 +116,6 @@ set (f90CStub_C_SOURCES
${HDF5_F90_SRC_SOURCE_DIR}/H5Tf.c
${HDF5_F90_SRC_SOURCE_DIR}/H5Zf.c
)
set_source_files_properties (${f90CStub_C_SOURCES} PROPERTIES LANGUAGE C)
set (f90CStub_C_HDRS
@ -163,17 +164,14 @@ add_custom_command (
OUTPUT ${HDF5_F90_SRC_BINARY_DIR}/H5_gen.F90
COMMAND ${CMD}
DEPENDS ${f90_F_GEN_SOURCES}
COMMENT "Generating H5_gen.F90"
)
add_custom_target (H5gen ALL
#v3.2 BYPRODUCT ${HDF5_F90_SRC_BINARY_DIR}/H5_gen.F90
#WORKING_DIRECTORY ${HDF5_F90_SRC_BINARY_DIR}
DEPENDS ${HDF5_F90_SRC_BINARY_DIR}/H5_gen.F90
)
set_source_files_properties (${HDF5_F90_SRC_BINARY_DIR}/H5_gen.F90 PROPERTIES GENERATED TRUE)
set (f90_F_BASE_SOURCES
# generated files
${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
# normal distribution
${HDF5_F90_SRC_SOURCE_DIR}/H5f90global.F90
${HDF5_F90_SRC_SOURCE_DIR}/H5fortkit.F90
@ -192,9 +190,11 @@ set (f90_F_BASE_SOURCES
${HDF5_F90_SRC_SOURCE_DIR}/H5Tff.F90
${HDF5_F90_SRC_SOURCE_DIR}/H5Zff.F90
)
set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5_gen.F90 PROPERTIES GENERATED TRUE)
set (f90_F_SOURCES
# generated file
${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
${f90_F_BASE_SOURCES}
# generated file