diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-09 18:45:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-09 18:45:44 (GMT) |
| commit | dcc66a4f157ace0858b788228550f3e104df3242 (patch) | |
| tree | e60eaa27df6d6bc80a32d6a73d329c41c423eb54 /hl | |
| parent | 7aeebec9463d18c3040ba7fa37464c00b64ab75e (diff) | |
| parent | d6ea76ac002cd8483ba8a6aaf55bbce5ed552937 (diff) | |
| download | hdf5-dcc66a4f157ace0858b788228550f3e104df3242.zip hdf5-dcc66a4f157ace0858b788228550f3e104df3242.tar.gz hdf5-dcc66a4f157ace0858b788228550f3e104df3242.tar.bz2 | |
Merge pull request #1049 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'd6ea76ac002cd8483ba8a6aaf55bbce5ed552937':
GGC requires attribute before function
Correct COMPILE defs usage
Add missing module_dir property
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/examples/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | hl/fortran/test/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt index cc671f0..27971b2 100644 --- a/hl/fortran/examples/CMakeLists.txt +++ b/hl/fortran/examples/CMakeLists.txt @@ -32,6 +32,7 @@ foreach (example ${examples}) set_target_properties (hl_f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran FOLDER examples/hl/fortran + Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static ) endforeach () diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 0ee8d5b..6ee362d 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -37,6 +37,7 @@ macro (ADD_H5_FORTRAN_EXE file) set_target_properties (hl_f90_${file} PROPERTIES LINKER_LANGUAGE Fortran FOLDER test/hl/fortran + Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static ) if (BUILD_SHARED_LIBS) add_executable (hl_f90_${file}-shared ${file}.F90) |