summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2015-10-14 21:27:13 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2015-10-14 21:27:13 (GMT)
commitdcda11177990040c790730808842c556f7ba16f7 (patch)
tree4078a61ec4bc6f7bfd19e34f9c1ab2d25b2173e8 /hl
parentcc261eb5e5cd016ec1529f44759f73cda2dc52bf (diff)
downloadhdf5-dcda11177990040c790730808842c556f7ba16f7.zip
hdf5-dcda11177990040c790730808842c556f7ba16f7.tar.gz
hdf5-dcda11177990040c790730808842c556f7ba16f7.tar.bz2
[svn-r28074] Merge from trunk CMake code.
Also two fortran source files were changed.
Diffstat (limited to 'hl')
-rw-r--r--hl/fortran/src/CMakeLists.txt5
1 files changed, 0 insertions, 5 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 83a205f..ead21be 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -48,11 +48,6 @@ if (WIN32)
else (WIN32)
set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
endif (WIN32)
-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)
#-----------------------------------------------------------------------------
# Setup include Directories