diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-15 20:38:57 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-15 20:38:57 (GMT) |
| commit | 9af344117c2d41886da1f54d3f5cff4091c4a943 (patch) | |
| tree | 9dcb6bf61c2fbc5634b69f554690bb740b8decbd /fortran/src/CMakeLists.txt | |
| parent | b2f94f9faf805035e4d0e9cb76007204c8250e58 (diff) | |
| parent | 14e3550348d08d932e0f61a4ae6b8a7afe19a484 (diff) | |
| download | hdf5-9af344117c2d41886da1f54d3f5cff4091c4a943.zip hdf5-9af344117c2d41886da1f54d3f5cff4091c4a943.tar.gz hdf5-9af344117c2d41886da1f54d3f5cff4091c4a943.tar.bz2 | |
[svn-r27794] Reintegration merge of features/autotools_rework branch with trunk
NOTES:
- Developers will have to run autogen.sh before building with the autotools.
- autogen.sh takes the -p option to mimic the old bin/reconfigure behavior.
- The generated error, overflow and version headers have been left in place.
- The generated H5LT parser code has also been left in place.
- There are no changes for CMake users at this time.
Tested on: h5committest
Diffstat (limited to 'fortran/src/CMakeLists.txt')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index dc884d5..4f19ed3 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -76,6 +76,11 @@ 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) INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY}) |