mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-13 16:47:58 +08:00
Merge pull request #35 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '60adc706e6c8bdee4a2e9a7c211f2f2a12dfc355': Add WORKING_DIR to command Add target depends require separate folders
This commit is contained in:
commit
5f13efeb79
@ -65,6 +65,7 @@ set_target_properties (H5_buildiface PROPERTIES
|
||||
)
|
||||
|
||||
if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
|
||||
file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
|
||||
if (WIN32)
|
||||
set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/\${BUILD_TYPE})
|
||||
else (WIN32)
|
||||
@ -161,15 +162,31 @@ set (f90_F_GEN_SOURCES
|
||||
)
|
||||
set (CMD $<TARGET_FILE:H5_buildiface>)
|
||||
add_custom_command (
|
||||
OUTPUT ${HDF5_F90_SRC_BINARY_DIR}/H5_gen.F90
|
||||
OUTPUT ${HDF5_F90_BINARY_DIR}/H5_gen.F90
|
||||
COMMAND ${CMD}
|
||||
WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
|
||||
DEPENDS ${f90_F_GEN_SOURCES}
|
||||
COMMENT "Generating H5_gen.F90"
|
||||
COMMENT "Generating the H5_gen.F90 file"
|
||||
)
|
||||
add_custom_target (H5gen ALL
|
||||
DEPENDS ${HDF5_F90_SRC_BINARY_DIR}/H5_gen.F90
|
||||
DEPENDS ${HDF5_F90_BINARY_DIR}/H5_gen.F90
|
||||
)
|
||||
set_source_files_properties (${HDF5_F90_SRC_BINARY_DIR}/H5_gen.F90 PROPERTIES GENERATED TRUE)
|
||||
set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5_gen.F90 PROPERTIES GENERATED TRUE)
|
||||
|
||||
if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
|
||||
set (CMDSH $<TARGET_FILE:H5_buildiface>)
|
||||
add_custom_command (
|
||||
OUTPUT ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
|
||||
COMMAND ${CMDSH}
|
||||
WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
|
||||
DEPENDS ${f90_F_GEN_SOURCES}
|
||||
COMMENT "Generating the H5_gen.F90 shared file"
|
||||
)
|
||||
add_custom_target (H5genSH ALL
|
||||
DEPENDS ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
|
||||
)
|
||||
set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90 PROPERTIES GENERATED TRUE)
|
||||
endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
|
||||
|
||||
set (f90_F_BASE_SOURCES
|
||||
# normal distribution
|
||||
@ -198,11 +215,25 @@ set (f90_F_SOURCES
|
||||
${f90_F_BASE_SOURCES}
|
||||
|
||||
# generated file
|
||||
${HDF5_F90_SRC_BINARY_DIR}/H5_gen.F90
|
||||
${HDF5_F90_BINARY_DIR}/H5_gen.F90
|
||||
|
||||
# normal distribution
|
||||
${HDF5_F90_SRC_SOURCE_DIR}/HDF5.F90
|
||||
)
|
||||
if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
|
||||
set (f90_F_SOURCES_SHARED
|
||||
# generated file
|
||||
${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
|
||||
|
||||
${f90_F_BASE_SOURCES}
|
||||
|
||||
# generated file
|
||||
${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
|
||||
|
||||
# normal distribution
|
||||
${HDF5_F90_SRC_SOURCE_DIR}/HDF5.F90
|
||||
)
|
||||
endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Add Main fortran library
|
||||
@ -228,9 +259,10 @@ if (WIN32)
|
||||
)
|
||||
endif (WIN32)
|
||||
set (install_targets ${install_targets} ${HDF5_F90_LIB_TARGET})
|
||||
add_dependencies(${HDF5_F90_LIB_TARGET} H5gen)
|
||||
|
||||
if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
|
||||
add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SOURCES})
|
||||
add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SOURCES_SHARED})
|
||||
set (SHARED_LINK_FLAGS " ")
|
||||
if (WIN32 AND MSVC)
|
||||
set (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def")
|
||||
@ -256,6 +288,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
|
||||
)
|
||||
endif (WIN32)
|
||||
set (install_targets ${install_targets} ${HDF5_F90_LIBSH_TARGET})
|
||||
add_dependencies(${HDF5_F90_LIBSH_TARGET} H5genSH)
|
||||
endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user