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 | |
| 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')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 8 |
2 files changed, 8 insertions, 5 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}) diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 7d78565..d211d35 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -105,9 +105,8 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \ $(top_srcdir)/config/conclude_fc.am \ $(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(srcdir)/H5config_f.inc.in \ - $(top_srcdir)/bin/mkinstalldirs $(srcdir)/h5fc.in \ - $(srcdir)/H5fort_type_defines.h.in $(top_srcdir)/bin/depcomp \ - $(top_srcdir)/bin/test-driver README + $(srcdir)/h5fc.in $(srcdir)/H5fort_type_defines.h.in \ + $(top_srcdir)/bin/depcomp $(top_srcdir)/bin/test-driver README # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, @@ -121,7 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ $(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/H5config.h H5config_f.inc CONFIG_CLEAN_FILES = h5fc H5fort_type_defines.h CONFIG_CLEAN_VPATH_FILES = @@ -452,7 +451,6 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_srcdir)/src \ -I$(top_srcdir)/fortran/src AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1) -AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ |