diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-02-02 20:12:12 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-02-02 20:12:12 (GMT) |
| commit | ffa2dec25d69ba2d530c5eb60e07d6618562017a (patch) | |
| tree | 777582f6bb0c4f7fea232e0410db2b99db0ef713 /hl/fortran | |
| parent | 116c40450c4c559c3713044dce590100273a4fa5 (diff) | |
| parent | b57c5490e0901c451a77a356ceb1f6071dc89123 (diff) | |
| download | hdf5-ffa2dec25d69ba2d530c5eb60e07d6618562017a.zip hdf5-ffa2dec25d69ba2d530c5eb60e07d6618562017a.tar.gz hdf5-ffa2dec25d69ba2d530c5eb60e07d6618562017a.tar.bz2 | |
Merge pull request #884 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b57c5490e0901c451a77a356ceb1f6071dc89123':
JHDFFV-10398 add note
HDFFV-10398 fix detection of repeat checks
HDFFV-10398 add support for Emscriptem build system
HDFFV-10398 avoid sanitizer failures
HDFFV-10398 - avoid ubsan crashes
HDFFV-10398 msvc: use /W0 rather than /w
HDFFV-10398 Suppress VS 2015 assertion failure popup during try_run
HDFFV-10398 use the target name for custom commands
HDFFV-10398 use the simpler add_subdirectory signature
HDFFV-10398 Honor CMAKE_MODULE_PATH when including check modules
Diffstat (limited to 'hl/fortran')
| -rw-r--r-- | hl/fortran/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt index c651ce9..00d7517 100644 --- a/hl/fortran/CMakeLists.txt +++ b/hl/fortran/CMakeLists.txt @@ -4,18 +4,18 @@ PROJECT (HDF5_HL_F90 C CXX Fortran) #----------------------------------------------------------------------------- # List Source files #----------------------------------------------------------------------------- -add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/src ${HDF5_HL_F90_BINARY_DIR}/src) +add_subdirectory (src) #----------------------------------------------------------------------------- # Build the HL Fortran Examples #----------------------------------------------------------------------------- if (HDF5_BUILD_EXAMPLES) - add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/examples ${HDF5_HL_F90_BINARY_DIR}/examples) + add_subdirectory (examples) endif () #----------------------------------------------------------------------------- # Testing #----------------------------------------------------------------------------- if (BUILD_TESTING) - add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/test ${HDF5_HL_F90_BINARY_DIR}/test) + add_subdirectory (test) endif () diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index b1a639a..5ad441c 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -109,10 +109,9 @@ set (HDF5_HL_F90_F_BASE_SOURCES ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.F90 ) -set (CMD $<TARGET_FILE:H5HL_buildiface>) add_custom_command ( OUTPUT ${HDF5_HL_F90_SRC_BINARY_DIR}/static/H5LTff_gen.F90 ${HDF5_HL_F90_SRC_BINARY_DIR}/H5TBff_gen.F90 - COMMAND ${CMD} + COMMAND $<TARGET_FILE:H5HL_buildiface> WORKING_DIRECTORY ${HDF5_HL_F90_SRC_BINARY_DIR}/static DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES} COMMENT "Generating the H5LTff_gen.F90, H5TBff_gen.F90 files" @@ -126,10 +125,9 @@ set_source_files_properties ( PROPERTIES GENERATED TRUE ) if (BUILD_SHARED_LIBS) - set (CMDSH $<TARGET_FILE:H5HL_buildiface>) add_custom_command ( OUTPUT ${HDF5_HL_F90_SRC_BINARY_DIR}/shared/H5LTff_gen.F90 ${HDF5_HL_F90_SRC_BINARY_DIR}/shared/H5TBff_gen.F90 - COMMAND ${CMD} + COMMAND $<TARGET_FILE:H5HL_buildiface> WORKING_DIRECTORY ${HDF5_HL_F90_SRC_BINARY_DIR}/shared DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES} COMMENT "Generating the H5LTff_gen.F90, H5TBff_gen.F90 shared files" |