summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-07-15 15:57:40 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-07-15 15:57:40 (GMT)
commit4667abe8a52a0147cd29b9991d196725dec3afc3 (patch)
treee9d54a084230e0b27f2c5b0d6980de36994178f0
parentb1800ed76717cb80d5de44a9ce1acb8b1f1baca1 (diff)
downloadhdf5-4667abe8a52a0147cd29b9991d196725dec3afc3.zip
hdf5-4667abe8a52a0147cd29b9991d196725dec3afc3.tar.gz
hdf5-4667abe8a52a0147cd29b9991d196725dec3afc3.tar.bz2
[svn-r27391] Added build dependencies to generated files
-rw-r--r--fortran/src/CMakeLists.txt10
-rw-r--r--hl/fortran/src/CMakeLists.txt11
2 files changed, 12 insertions, 9 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 21cf457..82554bb 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -161,16 +161,12 @@ set (f90_F_SRCS
)
set_source_files_properties (${f90_F_SRCS} PROPERTIES LANGUAGE Fortran)
-set_source_files_properties(
- ${HDF5_F90_BINARY_DIR}/H5_gen.F90
- PROPERTIES OBJECT_DEPENDS
- ${f90_F_BASE_SRCS}
+set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5_gen.F90
+ PROPERTIES OBJECT_DEPENDS "${f90_F_BASE_SRCS}"
)
set_source_files_properties(
${HDF5_F90_BINARY_DIR}/HDF5.F90
- PROPERTIES OBJECT_DEPENDS
- ${f90_F_BASE_SRCS}
- ${HDF5_F90_BINARY_DIR}/H5_gen.F90
+ PROPERTIES OBJECT_DEPENDS "${f90_F_BASE_SRCS} ${HDF5_F90_BINARY_DIR}/H5_gen.F90"
)
#-----------------------------------------------------------------------------
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 5082090..0cccac5 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -82,14 +82,14 @@ set_target_properties (${HDF5_HL_F90_C_LIB_TARGET} PROPERTIES
#-----------------------------------------------------------------------------
# Fortran Modules
#-----------------------------------------------------------------------------
-set (HDF5_HL_F90_F_SRCS
+set (HDF5_HL_F90_F_BASE_SRCS
${HDF5_HL_F90_SRC_SOURCE_DIR}/H5DSff.F90
${HDF5_HL_F90_SRC_SOURCE_DIR}/H5TBff.F90
${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTff.F90
${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.F90
)
set (HDF5_HL_F90_F_SRCS
- ${HDF5_HL_F90_F_SRCS}
+ ${HDF5_HL_F90_F_BASE_SRCS}
# generated files
${HDF5_HL_F90_SRC_BINARY_DIR}/H5LTff_gen.F90
@@ -98,6 +98,13 @@ set (HDF5_HL_F90_F_SRCS
set_source_files_properties (${HDF5_HL_F90_F_SRCS} PROPERTIES LANGUAGE Fortran)
+set_source_files_properties(
+ ${HDF5_HL_F90_SRC_BINARY_DIR}/H5LTff_gen.F90
+ ${HDF5_HL_F90_SRC_BINARY_DIR}/H5TBff_gen.F90
+ PROPERTIES OBJECT_DEPENDS "${HDF5_HL_F90_F_BASE_SRCS}"
+)
+
+
add_library (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS})
set (SHARED_LINK_FLAGS " ")
if (BUILD_SHARED_LIBS)