summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-09-20 20:42:52 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-09-20 20:42:52 (GMT)
commita796aa64873d270fae84c636f912454199599d57 (patch)
tree239baba389dbdde318a07882c74b19af970e8560
parent609f7e31f2d2861bf958e0e61b1336f2130b0d94 (diff)
parent347501aba2962691988e73ddb1b384397e507a80 (diff)
downloadhdf5-a796aa64873d270fae84c636f912454199599d57.zip
hdf5-a796aa64873d270fae84c636f912454199599d57.tar.gz
hdf5-a796aa64873d270fae84c636f912454199599d57.tar.bz2
Merge pull request #34 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '347501aba2962691988e73ddb1b384397e507a80': Add another source property Update generated files commands and properties
-rw-r--r--fortran/src/CMakeLists.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 4a0928e..e237ec6 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -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