Commit 3d604ca8 authored by David DeMarle's avatar David DeMarle
Browse files

backport changes from VTK 7.0.0

Some style. Some fixes, especially for windows with the exports and template changes.

More so adapt this to work well as a subdirectory in a larger project. Don't force settings
that the parent project owns, allow parent project to turn on tests without xdmf's tests and
make the name of the library an option so that parent can have two xdmfs.
parent f8285b81
...@@ -16,8 +16,8 @@ MACRO(ADD_TEST_C_DEPENDENCIES dependencies) ...@@ -16,8 +16,8 @@ MACRO(ADD_TEST_C_DEPENDENCIES dependencies)
SET_PROPERTY(GLOBAL APPEND PROPERTY C_TEST_DEPENDENCIES SET_PROPERTY(GLOBAL APPEND PROPERTY C_TEST_DEPENDENCIES
"${dependencies}" "${dependencies}"
) )
ENDIF(NOT ("${dependencies}" STREQUAL "")) ENDIF()
ENDMACRO(ADD_TEST_C_DEPENDENCIES dependencies) ENDMACRO()
# C Add LDPath Macro # C Add LDPath Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -30,8 +30,8 @@ MACRO(ADD_TEST_C_LDPATH ld) ...@@ -30,8 +30,8 @@ MACRO(ADD_TEST_C_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY C_TEST_LDPATH SET_PROPERTY(GLOBAL PROPERTY C_TEST_LDPATH
"${ldpath}${sep}${ld}" "${ldpath}${sep}${ld}"
) )
ENDIF("${ld}" STRGREATER "") ENDIF()
ENDMACRO(ADD_TEST_C_LDPATH ld) ENDMACRO()
# C Add Path Macro # C Add Path Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -44,8 +44,8 @@ MACRO(ADD_TEST_C_PATH p) ...@@ -44,8 +44,8 @@ MACRO(ADD_TEST_C_PATH p)
SET_PROPERTY(GLOBAL PROPERTY C_TEST_PATH SET_PROPERTY(GLOBAL PROPERTY C_TEST_PATH
"${path}${sep}${p}" "${path}${sep}${p}"
) )
ENDIF("${p}" STRGREATER "") ENDIF()
ENDMACRO(ADD_TEST_C_PATH p) ENDMACRO()
# C Test Macro # C Test Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -60,7 +60,7 @@ MACRO(ADD_TEST_C executable) ...@@ -60,7 +60,7 @@ MACRO(ADD_TEST_C executable)
IF(EXISTS ${c_source_dir}/${executable}.c) IF(EXISTS ${c_source_dir}/${executable}.c)
ADD_EXECUTABLE(${executable}${dup} ${c_source_dir}/${executable}.c) ADD_EXECUTABLE(${executable}${dup} ${c_source_dir}/${executable}.c)
ENDIF(EXISTS ${c_source_dir}/${executable}.c) ENDIF()
GET_PROPERTY(c_dependencies GLOBAL PROPERTY C_TEST_DEPENDENCIES) GET_PROPERTY(c_dependencies GLOBAL PROPERTY C_TEST_DEPENDENCIES)
GET_PROPERTY(c_ldpath GLOBAL PROPERTY C_TEST_LDPATH) GET_PROPERTY(c_ldpath GLOBAL PROPERTY C_TEST_LDPATH)
...@@ -77,8 +77,8 @@ MACRO(ADD_TEST_C executable) ...@@ -77,8 +77,8 @@ MACRO(ADD_TEST_C executable)
IF("${c_path}" STREQUAL "") IF("${c_path}" STREQUAL "")
SET(c_path ${c_ldpath}) SET(c_path ${c_ldpath})
ENDIF("${c_path}" STREQUAL "") ENDIF()
ENDIF(WIN32) ENDIF()
SET_CORE("${c_binary_dir}") SET_CORE("${c_binary_dir}")
ADD_TEST(C${is_core}_${executable}${dup} ${CMAKE_COMMAND} ADD_TEST(C${is_core}_${executable}${dup} ${CMAKE_COMMAND}
...@@ -92,8 +92,8 @@ MACRO(ADD_TEST_C executable) ...@@ -92,8 +92,8 @@ MACRO(ADD_TEST_C executable)
IF(NOT "${tdep}" STREQUAL "") IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(C${is_core}_${executable}${dup} SET_TESTS_PROPERTIES(C${is_core}_${executable}${dup}
PROPERTIES DEPENDS ${tdep}) PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "") ENDIF()
ENDMACRO(ADD_TEST_C executable) ENDMACRO()
# C MPI Test Macro # C MPI Test Macro
# Author: Andrew Burns # Author: Andrew Burns
...@@ -118,7 +118,7 @@ MACRO(ADD_MPI_TEST_C script files) ...@@ -118,7 +118,7 @@ MACRO(ADD_MPI_TEST_C script files)
IF(EXISTS ${c_source_dir}/${executable}.c) IF(EXISTS ${c_source_dir}/${executable}.c)
ADD_EXECUTABLE(${executable} ${c_source_dir}/${executable}.c) ADD_EXECUTABLE(${executable} ${c_source_dir}/${executable}.c)
ENDIF(EXISTS ${c_source_dir}/${executable}.c) ENDIF()
GET_PROPERTY(c_dependencies GLOBAL PROPERTY C_TEST_DEPENDENCIES) GET_PROPERTY(c_dependencies GLOBAL PROPERTY C_TEST_DEPENDENCIES)
GET_PROPERTY(c_ldpath GLOBAL PROPERTY C_TEST_LDPATH) GET_PROPERTY(c_ldpath GLOBAL PROPERTY C_TEST_LDPATH)
...@@ -135,9 +135,9 @@ MACRO(ADD_MPI_TEST_C script files) ...@@ -135,9 +135,9 @@ MACRO(ADD_MPI_TEST_C script files)
IF("${c_path}" STREQUAL "") IF("${c_path}" STREQUAL "")
SET(c_path ${c_ldpath}) SET(c_path ${c_ldpath})
ENDIF("${c_path}" STREQUAL "") ENDIF()
ENDIF(WIN32) ENDIF()
ENDWHILE(NOT "${tempfiles}" STREQUAL "") ENDWHILE()
SET_CORE("${c_binary_dir}") SET_CORE("${c_binary_dir}")
ADD_TEST(C${is_core}_${script} ${CMAKE_COMMAND} ADD_TEST(C${is_core}_${script} ${CMAKE_COMMAND}
...@@ -151,12 +151,12 @@ MACRO(ADD_MPI_TEST_C script files) ...@@ -151,12 +151,12 @@ MACRO(ADD_MPI_TEST_C script files)
IF(NOT "${tdep}" STREQUAL "") IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(C${is_core}_${script} SET_TESTS_PROPERTIES(C${is_core}_${script}
PROPERTIES DEPENDS ${tdep} ${script}) PROPERTIES DEPENDS ${tdep} ${script})
ENDIF(NOT "${tdep}" STREQUAL "") ENDIF()
file(COPY file(COPY
${c_source_dir}/${script} ${c_source_dir}/${script}
DESTINATION ${c_binary_dir}/ DESTINATION ${c_binary_dir}/
) )
ENDMACRO(ADD_MPI_TEST_C script files) ENDMACRO()
# C Clean Macro # C Clean Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -168,7 +168,7 @@ MACRO(CLEAN_TEST_C executable) ...@@ -168,7 +168,7 @@ MACRO(CLEAN_TEST_C executable)
set_property(DIRECTORY APPEND PROPERTY set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${ARGN} ADDITIONAL_MAKE_CLEAN_FILES ${ARGN}
) )
ENDMACRO(CLEAN_TEST_C executable) ENDMACRO()
# Configure the c 'driver' file # Configure the c 'driver' file
CONFIGURE_FILE(${TESTING_SUITE_DIR}/TestingSuite/TestDriverC.cmake.in ${c_binary_dir}/TestDriverC.cmake @ONLY) CONFIGURE_FILE(${TESTING_SUITE_DIR}/TestingSuite/TestDriverC.cmake.in ${c_binary_dir}/TestDriverC.cmake @ONLY)
......
...@@ -16,8 +16,8 @@ MACRO(ADD_TEST_CXX_DEPENDENCIES dependencies) ...@@ -16,8 +16,8 @@ MACRO(ADD_TEST_CXX_DEPENDENCIES dependencies)
SET_PROPERTY(GLOBAL APPEND PROPERTY CXX_TEST_DEPENDENCIES SET_PROPERTY(GLOBAL APPEND PROPERTY CXX_TEST_DEPENDENCIES
"${dependencies}" "${dependencies}"
) )
ENDIF(NOT ("${dependencies}" STREQUAL "")) ENDIF()
ENDMACRO(ADD_TEST_CXX_DEPENDENCIES dependencies) ENDMACRO()
# Cxx Add LDPath Macro # Cxx Add LDPath Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -30,8 +30,8 @@ MACRO(ADD_TEST_CXX_LDPATH ld) ...@@ -30,8 +30,8 @@ MACRO(ADD_TEST_CXX_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY CXX_TEST_LDPATH SET_PROPERTY(GLOBAL PROPERTY CXX_TEST_LDPATH
"${ldpath}${sep}${ld}" "${ldpath}${sep}${ld}"
) )
ENDIF("${ld}" STRGREATER "") ENDIF()
ENDMACRO(ADD_TEST_CXX_LDPATH ld) ENDMACRO()
# Cxx Add Path Macro # Cxx Add Path Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -44,8 +44,8 @@ MACRO(ADD_TEST_CXX_PATH p) ...@@ -44,8 +44,8 @@ MACRO(ADD_TEST_CXX_PATH p)
SET_PROPERTY(GLOBAL PROPERTY CXX_TEST_PATH SET_PROPERTY(GLOBAL PROPERTY CXX_TEST_PATH
"${path}${sep}${p}" "${path}${sep}${p}"
) )
ENDIF("${p}" STRGREATER "") ENDIF()
ENDMACRO(ADD_TEST_CXX_PATH p) ENDMACRO()
# CXX Test Macro # CXX Test Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -60,11 +60,11 @@ MACRO(ADD_TEST_CXX executable) ...@@ -60,11 +60,11 @@ MACRO(ADD_TEST_CXX executable)
IF(EXISTS ${cxx_source_dir}/${executable}.cpp) IF(EXISTS ${cxx_source_dir}/${executable}.cpp)
ADD_EXECUTABLE(${executable}${dup} ${cxx_source_dir}/${executable}.cpp) ADD_EXECUTABLE(${executable}${dup} ${cxx_source_dir}/${executable}.cpp)
ENDIF(EXISTS ${cxx_source_dir}/${executable}.cpp) ENDIF()
IF(EXISTS ${cxx_source_dir}/${executable}.cxx) IF(EXISTS ${cxx_source_dir}/${executable}.cxx)
ADD_EXECUTABLE(${executable}${dup} ${cxx_source_dir}/${executable}.cxx) ADD_EXECUTABLE(${executable}${dup} ${cxx_source_dir}/${executable}.cxx)
ENDIF(EXISTS ${cxx_source_dir}/${executable}.cxx) ENDIF()
GET_PROPERTY(cxx_dependencies GLOBAL PROPERTY CXX_TEST_DEPENDENCIES) GET_PROPERTY(cxx_dependencies GLOBAL PROPERTY CXX_TEST_DEPENDENCIES)
GET_PROPERTY(cxx_ldpath GLOBAL PROPERTY CXX_TEST_LDPATH) GET_PROPERTY(cxx_ldpath GLOBAL PROPERTY CXX_TEST_LDPATH)
...@@ -81,8 +81,8 @@ MACRO(ADD_TEST_CXX executable) ...@@ -81,8 +81,8 @@ MACRO(ADD_TEST_CXX executable)
IF("${cxx_path}" STREQUAL "") IF("${cxx_path}" STREQUAL "")
SET(cxx_path ${cxx_ldpath}) SET(cxx_path ${cxx_ldpath})
ENDIF("${cxx_path}" STREQUAL "") ENDIF()
ENDIF(WIN32) ENDIF()
SET_CORE("${cxx_binary_dir}") SET_CORE("${cxx_binary_dir}")
ADD_TEST(Cxx${is_core}_${executable}${dup} ${CMAKE_COMMAND} ADD_TEST(Cxx${is_core}_${executable}${dup} ${CMAKE_COMMAND}
...@@ -96,8 +96,8 @@ MACRO(ADD_TEST_CXX executable) ...@@ -96,8 +96,8 @@ MACRO(ADD_TEST_CXX executable)
IF(NOT "${tdep}" STREQUAL "") IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(Cxx${is_core}_${executable}${dup} SET_TESTS_PROPERTIES(Cxx${is_core}_${executable}${dup}
PROPERTIES DEPENDS ${tdep}) PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "") ENDIF()
ENDMACRO(ADD_TEST_CXX executable) ENDMACRO()
# CXX MPI Test Macro # CXX MPI Test Macro
# Author: Andrew Burns # Author: Andrew Burns
...@@ -122,11 +122,11 @@ MACRO(ADD_MPI_TEST_CXX script files) ...@@ -122,11 +122,11 @@ MACRO(ADD_MPI_TEST_CXX script files)
IF(EXISTS ${cxx_source_dir}/${executable}.cpp) IF(EXISTS ${cxx_source_dir}/${executable}.cpp)
ADD_EXECUTABLE(${executable} ${cxx_source_dir}/${executable}.cpp) ADD_EXECUTABLE(${executable} ${cxx_source_dir}/${executable}.cpp)
ENDIF(EXISTS ${cxx_source_dir}/${executable}.cpp) ENDIF()
IF(EXISTS ${cxx_source_dir}/${executable}.cxx) IF(EXISTS ${cxx_source_dir}/${executable}.cxx)
ADD_EXECUTABLE(${executable} ${cxx_source_dir}/${executable}.cxx) ADD_EXECUTABLE(${executable} ${cxx_source_dir}/${executable}.cxx)
ENDIF(EXISTS ${cxx_source_dir}/${executable}.cxx) ENDIF()
GET_PROPERTY(cxx_dependencies GLOBAL PROPERTY CXX_TEST_DEPENDENCIES) GET_PROPERTY(cxx_dependencies GLOBAL PROPERTY CXX_TEST_DEPENDENCIES)
GET_PROPERTY(cxx_ldpath GLOBAL PROPERTY CXX_TEST_LDPATH) GET_PROPERTY(cxx_ldpath GLOBAL PROPERTY CXX_TEST_LDPATH)
...@@ -143,9 +143,9 @@ MACRO(ADD_MPI_TEST_CXX script files) ...@@ -143,9 +143,9 @@ MACRO(ADD_MPI_TEST_CXX script files)
IF("${cxx_path}" STREQUAL "") IF("${cxx_path}" STREQUAL "")
SET(cxx_path ${cxx_ldpath}) SET(cxx_path ${cxx_ldpath})
ENDIF("${cxx_path}" STREQUAL "") ENDIF()
ENDIF(WIN32) ENDIF()
ENDWHILE(NOT "${tempfiles}" STREQUAL "") ENDWHILE()
SET_CORE("${cxx_binary_dir}") SET_CORE("${cxx_binary_dir}")
ADD_TEST(Cxx${is_core}_${script} ${CMAKE_COMMAND} ADD_TEST(Cxx${is_core}_${script} ${CMAKE_COMMAND}
...@@ -159,12 +159,12 @@ MACRO(ADD_MPI_TEST_CXX script files) ...@@ -159,12 +159,12 @@ MACRO(ADD_MPI_TEST_CXX script files)
IF(NOT "${tdep}" STREQUAL "") IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(Cxx${is_core}_${script} SET_TESTS_PROPERTIES(Cxx${is_core}_${script}
PROPERTIES DEPENDS ${tdep} ${script}) PROPERTIES DEPENDS ${tdep} ${script})
ENDIF(NOT "${tdep}" STREQUAL "") ENDIF()
file(COPY file(COPY
${cxx_source_dir}/${script} ${cxx_source_dir}/${script}
DESTINATION ${cxx_binary_dir}/ DESTINATION ${cxx_binary_dir}/
) )
ENDMACRO(ADD_MPI_TEST_CXX script files) ENDMACRO()
# CXX Clean Macro # CXX Clean Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -176,7 +176,7 @@ MACRO(CLEAN_TEST_CXX executable) ...@@ -176,7 +176,7 @@ MACRO(CLEAN_TEST_CXX executable)
set_property(DIRECTORY APPEND PROPERTY set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${ARGN} ADDITIONAL_MAKE_CLEAN_FILES ${ARGN}
) )
ENDMACRO(CLEAN_TEST_CXX executable) ENDMACRO()
# Configure the cxx 'driver' file # Configure the cxx 'driver' file
CONFIGURE_FILE(${TESTING_SUITE_DIR}/TestingSuite/TestDriverCxx.cmake.in ${cxx_binary_dir}/TestDriverCxx.cmake @ONLY) CONFIGURE_FILE(${TESTING_SUITE_DIR}/TestingSuite/TestDriverCxx.cmake.in ${cxx_binary_dir}/TestDriverCxx.cmake @ONLY)
......
...@@ -16,8 +16,8 @@ MACRO(ADD_TEST_FORTRAN_DEPENDENCIES dependencies) ...@@ -16,8 +16,8 @@ MACRO(ADD_TEST_FORTRAN_DEPENDENCIES dependencies)
SET_PROPERTY(GLOBAL APPEND PROPERTY FORTRAN_TEST_DEPENDENCIES SET_PROPERTY(GLOBAL APPEND PROPERTY FORTRAN_TEST_DEPENDENCIES
"${dependencies}" "${dependencies}"
) )
ENDIF(NOT ("${dependencies}" STREQUAL "")) ENDIF()
ENDMACRO(ADD_TEST_FORTRAN_DEPENDENCIES dependencies) ENDMACRO()
# Fortran Add LDPath Macro # Fortran Add LDPath Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -30,8 +30,8 @@ MACRO(ADD_TEST_FORTRAN_LDPATH ld) ...@@ -30,8 +30,8 @@ MACRO(ADD_TEST_FORTRAN_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY FORTRAN_TEST_LDPATH SET_PROPERTY(GLOBAL PROPERTY FORTRAN_TEST_LDPATH
"${ldpath}${sep}${ld}" "${ldpath}${sep}${ld}"
) )
ENDIF("${ld}" STRGREATER "") ENDIF()
ENDMACRO(ADD_TEST_FORTRAN_LDPATH ld) ENDMACRO()
# Fortran Add Path Macro # Fortran Add Path Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -44,8 +44,8 @@ MACRO(ADD_TEST_FORTRAN_PATH p) ...@@ -44,8 +44,8 @@ MACRO(ADD_TEST_FORTRAN_PATH p)
SET_PROPERTY(GLOBAL PROPERTY FORTRAN_TEST_PATH SET_PROPERTY(GLOBAL PROPERTY FORTRAN_TEST_PATH
"${path}${sep}${p}" "${path}${sep}${p}"
) )
ENDIF("${p}" STRGREATER "") ENDIF()
ENDMACRO(ADD_TEST_FORTRAN_PATH p) ENDMACRO()
# Fortran Test Macro # Fortran Test Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -60,15 +60,15 @@ MACRO(ADD_TEST_FORTRAN executable) ...@@ -60,15 +60,15 @@ MACRO(ADD_TEST_FORTRAN executable)
IF(EXISTS ${fortran_source_dir}/${executable}.f) IF(EXISTS ${fortran_source_dir}/${executable}.f)
ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f) ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f)
ENDIF(EXISTS ${fortran_source_dir}/${executable}.f) ENDIF()
IF(EXISTS ${fortran_source_dir}/${executable}.f90) IF(EXISTS ${fortran_source_dir}/${executable}.f90)
ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f90) ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f90)
ENDIF(EXISTS ${fortran_source_dir}/${executable}.f90) ENDIF()
IF(EXISTS ${fortran_source_dir}/${executable}.F90) IF(EXISTS ${fortran_source_dir}/${executable}.F90)
ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.F90) ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.F90)
ENDIF(EXISTS ${fortran_source_dir}/${executable}.F90) ENDIF()
GET_PROPERTY(fortran_dependencies GLOBAL PROPERTY FORTRAN_TEST_DEPENDENCIES) GET_PROPERTY(fortran_dependencies GLOBAL PROPERTY FORTRAN_TEST_DEPENDENCIES)
GET_PROPERTY(fortran_ldpath GLOBAL PROPERTY FORTRAN_TEST_LDPATH) GET_PROPERTY(fortran_ldpath GLOBAL PROPERTY FORTRAN_TEST_LDPATH)
...@@ -85,8 +85,8 @@ MACRO(ADD_TEST_FORTRAN executable) ...@@ -85,8 +85,8 @@ MACRO(ADD_TEST_FORTRAN executable)
IF("${fortran_path}" STREQUAL "") IF("${fortran_path}" STREQUAL "")
SET(fortran_path ${fortran_ldpath}) SET(fortran_path ${fortran_ldpath})
ENDIF("${fortran_path}" STREQUAL "") ENDIF()
ENDIF(WIN32) ENDIF()
SET_CORE("${fortran_binary_dir}") SET_CORE("${fortran_binary_dir}")
ADD_TEST(FORTRAN${is_core}_${executable}${dup} ${CMAKE_COMMAND} ADD_TEST(FORTRAN${is_core}_${executable}${dup} ${CMAKE_COMMAND}
...@@ -100,8 +100,8 @@ MACRO(ADD_TEST_FORTRAN executable) ...@@ -100,8 +100,8 @@ MACRO(ADD_TEST_FORTRAN executable)
IF(NOT "${tdep}" STREQUAL "") IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(FORTRAN${is_core}_${executable}${dup} SET_TESTS_PROPERTIES(FORTRAN${is_core}_${executable}${dup}
PROPERTIES DEPENDS ${tdep}) PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "") ENDIF()
ENDMACRO(ADD_TEST_FORTRAN executable) ENDMACRO()
# Fortran MPI Test Macro # Fortran MPI Test Macro
# Author: Andrew Burns # Author: Andrew Burns
...@@ -126,15 +126,15 @@ MACRO(ADD_MPI_TEST_FORTRAN script files) ...@@ -126,15 +126,15 @@ MACRO(ADD_MPI_TEST_FORTRAN script files)
IF(EXISTS ${fortran_source_dir}/${executable}.f) IF(EXISTS ${fortran_source_dir}/${executable}.f)
ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f) ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f)
ENDIF(EXISTS ${fortran_source_dir}/${executable}.f) ENDIF()
IF(EXISTS ${fortran_source_dir}/${executable}.f90) IF(EXISTS ${fortran_source_dir}/${executable}.f90)
ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f90) ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f90)
ENDIF(EXISTS ${fortran_source_dir}/${executable}.f90) ENDIF()
IF(EXISTS ${fortran_source_dir}/${executable}.F90) IF(EXISTS ${fortran_source_dir}/${executable}.F90)
ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.F90) ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.F90)
ENDIF(EXISTS ${fortran_source_dir}/${executable}.F90) ENDIF()
GET_PROPERTY(fortran_dependencies GLOBAL PROPERTY FORTRAN_TEST_DEPENDENCIES) GET_PROPERTY(fortran_dependencies GLOBAL PROPERTY FORTRAN_TEST_DEPENDENCIES)
GET_PROPERTY(fortran_ldpath GLOBAL PROPERTY FORTRAN_TEST_LDPATH) GET_PROPERTY(fortran_ldpath GLOBAL PROPERTY FORTRAN_TEST_LDPATH)
...@@ -151,9 +151,9 @@ MACRO(ADD_MPI_TEST_FORTRAN script files) ...@@ -151,9 +151,9 @@ MACRO(ADD_MPI_TEST_FORTRAN script files)
IF("${fortran_path}" STREQUAL "") IF("${fortran_path}" STREQUAL "")
SET(fortran_path ${fortran_ldpath}) SET(fortran_path ${fortran_ldpath})
ENDIF("${fortran_path}" STREQUAL "") ENDIF()
ENDIF(WIN32) ENDIF()
ENDWHILE(NOT "${tempfiles}" STREQUAL "") ENDWHILE()
SET_CORE("${fortran_binary_dir}") SET_CORE("${fortran_binary_dir}")
ADD_TEST(FORTRAN${is_core}_${script} ${CMAKE_COMMAND} ADD_TEST(FORTRAN${is_core}_${script} ${CMAKE_COMMAND}
...@@ -167,12 +167,12 @@ MACRO(ADD_MPI_TEST_FORTRAN script files) ...@@ -167,12 +167,12 @@ MACRO(ADD_MPI_TEST_FORTRAN script files)
IF(NOT "${tdep}" STREQUAL "") IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(FORTRAN${is_core}_${script} SET_TESTS_PROPERTIES(FORTRAN${is_core}_${script}
PROPERTIES DEPENDS ${tdep} ${script}) PROPERTIES DEPENDS ${tdep} ${script})
ENDIF(NOT "${tdep}" STREQUAL "") ENDIF()
file(COPY file(COPY
${fortran_source_dir}/${script} ${fortran_source_dir}/${script}
DESTINATION ${fortran_binary_dir}/ DESTINATION ${fortran_binary_dir}/
) )
ENDMACRO(ADD_MPI_TEST_FORTRAN script files) ENDMACRO()
# Fortran Clean Macro # Fortran Clean Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -184,7 +184,7 @@ MACRO(CLEAN_TEST_FORTRAN executable) ...@@ -184,7 +184,7 @@ MACRO(CLEAN_TEST_FORTRAN executable)
set_property(DIRECTORY APPEND PROPERTY set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${ARGN} ADDITIONAL_MAKE_CLEAN_FILES ${ARGN}
) )
ENDMACRO(CLEAN_TEST_FORTRAN executable) ENDMACRO()
# Configure the Fortran 'driver' file # Configure the Fortran 'driver' file
CONFIGURE_FILE(${TESTING_SUITE_DIR}/TestingSuite/TestDriverFortran.cmake.in ${fortran_binary_dir}/TestDriverFortran.cmake @ONLY) CONFIGURE_FILE(${TESTING_SUITE_DIR}/TestingSuite/TestDriverFortran.cmake.in ${fortran_binary_dir}/TestDriverFortran.cmake @ONLY)
......
...@@ -14,8 +14,8 @@ MACRO(ADD_TEST_JAVA_DEPENDENCIES dependencies) ...@@ -14,8 +14,8 @@ MACRO(ADD_TEST_JAVA_DEPENDENCIES dependencies)
SET_PROPERTY(GLOBAL APPEND PROPERTY JAVA_TEST_DEPENDENCIES SET_PROPERTY(GLOBAL APPEND PROPERTY JAVA_TEST_DEPENDENCIES
"${dependencies}" "${dependencies}"
) )
ENDIF(NOT ("${dependencies}" STREQUAL "")) ENDIF()
ENDMACRO(ADD_TEST_JAVA_DEPENDENCIES dependencies) ENDMACRO()
# Java Add File Dependencies Macro # Java Add File Dependencies Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -28,8 +28,8 @@ MACRO(ADD_TEST_JAVA_FILE_DEPENDENCIES dependencies) ...@@ -28,8 +28,8 @@ MACRO(ADD_TEST_JAVA_FILE_DEPENDENCIES dependencies)
SET_PROPERTY(GLOBAL APPEND PROPERTY JAVA_TEST_FILE_DEPENDENCIES SET_PROPERTY(GLOBAL APPEND PROPERTY JAVA_TEST_FILE_DEPENDENCIES
"${dependencies}" "${dependencies}"
) )
ENDIF(NOT ("${dependencies}" STREQUAL "")) ENDIF()
ENDMACRO(ADD_TEST_JAVA_FILE_DEPENDENCIES dependencies) ENDMACRO()
# Java Add Classpath Macro # Java Add Classpath Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -42,8 +42,8 @@ MACRO(ADD_TEST_JAVA_CLASSPATH cp) ...@@ -42,8 +42,8 @@ MACRO(ADD_TEST_JAVA_CLASSPATH cp)
SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_CLASSPATH SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_CLASSPATH
"${classpath}${sep}${cp}" "${classpath}${sep}${cp}"
) )
ENDIF(NOT ("${cp}" STREQUAL "")) ENDIF()
ENDMACRO(ADD_TEST_JAVA_CLASSPATH cp) ENDMACRO()
# Java Add LDPath Macro # Java Add LDPath Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -56,8 +56,8 @@ MACRO(ADD_TEST_JAVA_LDPATH ld) ...@@ -56,8 +56,8 @@ MACRO(ADD_TEST_JAVA_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_LDPATH SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_LDPATH
"${ldpath}${sep}${ld}" "${ldpath}${sep}${ld}"
) )
ENDIF("${ld}" STRGREATER "") ENDIF()
ENDMACRO(ADD_TEST_JAVA_LDPATH ld) ENDMACRO()
# Java Add Path Macro # Java Add Path Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -70,8 +70,8 @@ MACRO(ADD_TEST_JAVA_PATH p) ...@@ -70,8 +70,8 @@ MACRO(ADD_TEST_JAVA_PATH p)
SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_PATH SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_PATH
"${path}${sep}${p}" "${path}${sep}${p}"
) )
ENDIF("${p}" STRGREATER "") ENDIF()
ENDMACRO(ADD_TEST_JAVA_PATH p) ENDMACRO()
# Add Java Test Macro # Add Java Test Macro
# Author: Brian Panneton # Author: Brian Panneton
...@@ -109,8 +109,8 @@ MACRO(ADD_TEST_JAVA executable) ...@@ -109,8 +109,8 @@ MACRO(ADD_TEST_JAVA executable)
IF(WIN32) IF(WIN32)
IF("${java_path}" STREQUAL "") IF("${java_path}" STREQUAL "")
SET(java_path ${java_ldpath}) SET(java_path ${java_ldpath})
ENDIF("${java_path}" STREQUAL "") ENDIF()