diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-22 16:04:54 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-22 16:04:54 (GMT) |
| commit | a2236b4e89e2736e0080064aef0835e19709842a (patch) | |
| tree | 7902ae9acda94d2bda3980653c760c6e9c950741 /fortran/src/CMakeLists.txt | |
| parent | 57d670faa68f1ce52d82652be5f88ee02f862545 (diff) | |
| download | hdf5-a2236b4e89e2736e0080064aef0835e19709842a.zip hdf5-a2236b4e89e2736e0080064aef0835e19709842a.tar.gz hdf5-a2236b4e89e2736e0080064aef0835e19709842a.tar.bz2 | |
[svn-r27855] Merged revisions:
27509, 27515, 27517, 27521, 27524, 27525, 27537, 27555, 27570, 27575,
27585, 27586, 27590, 27591, 27592
from the trunk.
Minor CMake and Fortran changes
Tested on: jam (w/ gcc/gfortran 4.9.3)
Diffstat (limited to 'fortran/src/CMakeLists.txt')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index dc884d5..cf4be30 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -70,12 +70,13 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) else (WIN32) set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared) endif (WIN32) +else (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) + if (WIN32) + set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE}) + else (WIN32) + set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static) + endif (WIN32) endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) -if (WIN32) - set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE}) -else (WIN32) - set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static) -endif (WIN32) INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY}) |