diff options
Diffstat (limited to 'fortran/testpar')
| -rw-r--r-- | fortran/testpar/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.in | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt index 4b9d4f1..7f702da 100644 --- a/fortran/testpar/CMakeLists.txt +++ b/fortran/testpar/CMakeLists.txt @@ -22,6 +22,7 @@ ADD_EXECUTABLE (parallel_test mdset.f90 ) H5_NAMING (parallel_test) +TARGET_FORTRAN_WIN_PROPERTIES (parallel_test) TARGET_LINK_LIBRARIES (parallel_test ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} @@ -30,18 +31,6 @@ TARGET_LINK_LIBRARIES (parallel_test IF (WIN32) IF (MSVC) TARGET_LINK_LIBRARIES (parallel_test "ws2_32.lib") - IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (parallel_test - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (parallel_test - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (BUILD_SHARED_LIBS) ENDIF (MSVC) ENDIF (WIN32) SET_TARGET_PROPERTIES (parallel_test PROPERTIES LINKER_LANGUAGE Fortran) diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index c21be61..7bef605 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -298,7 +298,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -347,6 +346,7 @@ H5CC_PP = $(bindir)/h5pcc H5FC = $(bindir)/h5fc H5FC_PP = $(bindir)/h5pfc H5CPP = $(bindir)/h5c++ +ACLOCAL_AMFLAGS = "-I m4" # The trace script; this is used on source files from the C library to # insert tracing macros. |