summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-09-15 13:01:01 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-09-15 13:01:01 (GMT)
commit1177e649253e39aa5c8f76cb3374e412c542e415 (patch)
tree39207033347a3abd7ab9d057ac752f5741c15d8b /hl
parent2416d5e8ce763ad6ff4168b087a7a06202fa6f40 (diff)
downloadhdf5-1177e649253e39aa5c8f76cb3374e412c542e415.zip
hdf5-1177e649253e39aa5c8f76cb3374e412c542e415.tar.gz
hdf5-1177e649253e39aa5c8f76cb3374e412c542e415.tar.bz2
[svn-r27787] Merge of r27632-27674 from the trunk.
Tested on: h5committest
Diffstat (limited to 'hl')
-rw-r--r--hl/fortran/src/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index ead21be..20b1b28 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -36,13 +36,13 @@ set_target_properties (H5HL_buildiface PROPERTIES
Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
)
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (NOT SKIP_HDF5_FORTRAN_SHARED)
if (WIN32)
- set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/\${BUILD_TYPE})
+ set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE})
else (WIN32)
- set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+ set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
endif (WIN32)
-endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+endif (NOT SKIP_HDF5_FORTRAN_SHARED)
if (WIN32)
set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE})
else (WIN32)