summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-04-02 18:35:01 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-04-02 18:35:01 (GMT)
commit98bbf4a36a2410fe0862c739370365a160053f17 (patch)
treec07dd05d13fe3729d677ffe82be9d2a662035467 /hl/fortran
parent5555f057ae4203b469cc22c6fc9bf886ff809343 (diff)
downloadhdf5-98bbf4a36a2410fe0862c739370365a160053f17.zip
hdf5-98bbf4a36a2410fe0862c739370365a160053f17.tar.gz
hdf5-98bbf4a36a2410fe0862c739370365a160053f17.tar.bz2
[svn-r24948] Group tests by Common name
Remove WIN32 AND NOT CYGWIN if blocks - should be just WIN32 Tested: local linux CMake
Diffstat (limited to 'hl/fortran')
-rw-r--r--hl/fortran/examples/CMakeTests.cmake2
-rw-r--r--hl/fortran/src/CMakeLists.txt14
-rw-r--r--hl/fortran/test/CMakeTests.cmake14
3 files changed, 17 insertions, 13 deletions
diff --git a/hl/fortran/examples/CMakeTests.cmake b/hl/fortran/examples/CMakeTests.cmake
index 1784041..954a01b 100644
--- a/hl/fortran/examples/CMakeTests.cmake
+++ b/hl/fortran/examples/CMakeTests.cmake
@@ -6,5 +6,5 @@
##############################################################################
foreach (example ${examples})
- add_test (NAME hl_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
+ add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
endforeach (example ${examples})
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index a95873b..c5b2d57 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -49,7 +49,7 @@ set (HDF5_HL_F90_F_SRCS
add_library (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS})
set (SHARED_LINK_FLAGS " ")
if (BUILD_SHARED_LIBS)
- if (WIN32 AND NOT CYGWIN)
+ if (WIN32)
set_property (TARGET ${HDF5_HL_F90_LIB_TARGET}
APPEND PROPERTY COMPILE_DEFINITIONS
BUILD_HDF5_DLL
@@ -57,14 +57,14 @@ if (BUILD_SHARED_LIBS)
if (MSVC)
set (SHARED_LINK_FLAGS "/DLL")
endif (MSVC)
- endif (WIN32 AND NOT CYGWIN)
+ endif (WIN32)
endif (BUILD_SHARED_LIBS)
-if (WIN32 AND NOT CYGWIN)
+if (WIN32)
set_property (TARGET ${HDF5_HL_F90_LIB_TARGET}
APPEND PROPERTY COMPILE_DEFINITIONS
HDF5F90_WINDOWS
)
-endif (WIN32 AND NOT CYGWIN)
+endif (WIN32)
TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} " " ${SHARED_LINK_FLAGS})
set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran)
target_link_libraries (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
@@ -78,7 +78,7 @@ set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
#-----------------------------------------------------------------------------
# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
-if (WIN32 AND NOT CYGWIN)
+if (WIN32)
install (
FILES
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5ds.mod
@@ -90,7 +90,7 @@ if (WIN32 AND NOT CYGWIN)
COMPONENT
fortheaders
)
-else (WIN32 AND NOT CYGWIN)
+else (WIN32)
install (
FILES
${CMAKE_Fortran_MODULE_DIRECTORY}/h5ds.mod
@@ -102,7 +102,7 @@ else (WIN32 AND NOT CYGWIN)
COMPONENT
fortheaders
)
-endif (WIN32 AND NOT CYGWIN)
+endif (WIN32)
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index 94bb385..3676d24 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -7,7 +7,7 @@
# Remove any output file left over from previous test run
add_test (
- NAME hl_fortran_test-clear-objects
+ NAME HL_FORTRAN_test-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
dsetf1.h5
@@ -20,10 +20,14 @@ add_test (
tstds.h5
)
-add_test (NAME hl_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>)
+add_test (NAME HL_FORTRAN_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>)
+set_tests_properties (HL_FORTRAN_f90_tstds PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
-add_test (NAME hl_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>)
+add_test (NAME HL_FORTRAN_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>)
+set_tests_properties (HL_FORTRAN_f90_tstlite PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
-add_test (NAME hl_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>)
+add_test (NAME HL_FORTRAN_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>)
+set_tests_properties (HL_FORTRAN_f90_tstimage PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
-add_test (NAME hl_f90_tsttable COMMAND $<TARGET_FILE:hl_f90_tsttable>)
+add_test (NAME HL_FORTRAN_f90_tsttable COMMAND $<TARGET_FILE:hl_f90_tsttable>)
+set_tests_properties (HL_FORTRAN_f90_tsttable PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)