Commit 3d604ca8 authored by David E. DeMarle's avatar David E. DeMarle

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)
SET_PROPERTY(GLOBAL APPEND PROPERTY C_TEST_DEPENDENCIES
"${dependencies}"
)
ENDIF(NOT ("${dependencies}" STREQUAL ""))
ENDMACRO(ADD_TEST_C_DEPENDENCIES dependencies)
ENDIF()
ENDMACRO()
# C Add LDPath Macro
# Author: Brian Panneton
......@@ -30,8 +30,8 @@ MACRO(ADD_TEST_C_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY C_TEST_LDPATH
"${ldpath}${sep}${ld}"
)
ENDIF("${ld}" STRGREATER "")
ENDMACRO(ADD_TEST_C_LDPATH ld)
ENDIF()
ENDMACRO()
# C Add Path Macro
# Author: Brian Panneton
......@@ -44,8 +44,8 @@ MACRO(ADD_TEST_C_PATH p)
SET_PROPERTY(GLOBAL PROPERTY C_TEST_PATH
"${path}${sep}${p}"
)
ENDIF("${p}" STRGREATER "")
ENDMACRO(ADD_TEST_C_PATH p)
ENDIF()
ENDMACRO()
# C Test Macro
# Author: Brian Panneton
......@@ -60,7 +60,7 @@ MACRO(ADD_TEST_C executable)
IF(EXISTS ${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_ldpath GLOBAL PROPERTY C_TEST_LDPATH)
......@@ -77,8 +77,8 @@ MACRO(ADD_TEST_C executable)
IF("${c_path}" STREQUAL "")
SET(c_path ${c_ldpath})
ENDIF("${c_path}" STREQUAL "")
ENDIF(WIN32)
ENDIF()
ENDIF()
SET_CORE("${c_binary_dir}")
ADD_TEST(C${is_core}_${executable}${dup} ${CMAKE_COMMAND}
......@@ -92,8 +92,8 @@ MACRO(ADD_TEST_C executable)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(C${is_core}_${executable}${dup}
PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDMACRO(ADD_TEST_C executable)
ENDIF()
ENDMACRO()
# C MPI Test Macro
# Author: Andrew Burns
......@@ -118,7 +118,7 @@ MACRO(ADD_MPI_TEST_C script files)
IF(EXISTS ${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_ldpath GLOBAL PROPERTY C_TEST_LDPATH)
......@@ -135,9 +135,9 @@ MACRO(ADD_MPI_TEST_C script files)
IF("${c_path}" STREQUAL "")
SET(c_path ${c_ldpath})
ENDIF("${c_path}" STREQUAL "")
ENDIF(WIN32)
ENDWHILE(NOT "${tempfiles}" STREQUAL "")
ENDIF()
ENDIF()
ENDWHILE()
SET_CORE("${c_binary_dir}")
ADD_TEST(C${is_core}_${script} ${CMAKE_COMMAND}
......@@ -151,12 +151,12 @@ MACRO(ADD_MPI_TEST_C script files)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(C${is_core}_${script}
PROPERTIES DEPENDS ${tdep} ${script})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDIF()
file(COPY
${c_source_dir}/${script}
DESTINATION ${c_binary_dir}/
)
ENDMACRO(ADD_MPI_TEST_C script files)
ENDMACRO()
# C Clean Macro
# Author: Brian Panneton
......@@ -168,7 +168,7 @@ MACRO(CLEAN_TEST_C executable)
set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${ARGN}
)
ENDMACRO(CLEAN_TEST_C executable)
ENDMACRO()
# Configure the c 'driver' file
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)
SET_PROPERTY(GLOBAL APPEND PROPERTY CXX_TEST_DEPENDENCIES
"${dependencies}"
)
ENDIF(NOT ("${dependencies}" STREQUAL ""))
ENDMACRO(ADD_TEST_CXX_DEPENDENCIES dependencies)
ENDIF()
ENDMACRO()
# Cxx Add LDPath Macro
# Author: Brian Panneton
......@@ -30,8 +30,8 @@ MACRO(ADD_TEST_CXX_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY CXX_TEST_LDPATH
"${ldpath}${sep}${ld}"
)
ENDIF("${ld}" STRGREATER "")
ENDMACRO(ADD_TEST_CXX_LDPATH ld)
ENDIF()
ENDMACRO()
# Cxx Add Path Macro
# Author: Brian Panneton
......@@ -44,8 +44,8 @@ MACRO(ADD_TEST_CXX_PATH p)
SET_PROPERTY(GLOBAL PROPERTY CXX_TEST_PATH
"${path}${sep}${p}"
)
ENDIF("${p}" STRGREATER "")
ENDMACRO(ADD_TEST_CXX_PATH p)
ENDIF()
ENDMACRO()
# CXX Test Macro
# Author: Brian Panneton
......@@ -60,11 +60,11 @@ MACRO(ADD_TEST_CXX executable)
IF(EXISTS ${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)
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_ldpath GLOBAL PROPERTY CXX_TEST_LDPATH)
......@@ -81,8 +81,8 @@ MACRO(ADD_TEST_CXX executable)
IF("${cxx_path}" STREQUAL "")
SET(cxx_path ${cxx_ldpath})
ENDIF("${cxx_path}" STREQUAL "")
ENDIF(WIN32)
ENDIF()
ENDIF()
SET_CORE("${cxx_binary_dir}")
ADD_TEST(Cxx${is_core}_${executable}${dup} ${CMAKE_COMMAND}
......@@ -96,8 +96,8 @@ MACRO(ADD_TEST_CXX executable)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(Cxx${is_core}_${executable}${dup}
PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDMACRO(ADD_TEST_CXX executable)
ENDIF()
ENDMACRO()
# CXX MPI Test Macro
# Author: Andrew Burns
......@@ -122,11 +122,11 @@ MACRO(ADD_MPI_TEST_CXX script files)
IF(EXISTS ${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)
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_ldpath GLOBAL PROPERTY CXX_TEST_LDPATH)
......@@ -143,9 +143,9 @@ MACRO(ADD_MPI_TEST_CXX script files)
IF("${cxx_path}" STREQUAL "")
SET(cxx_path ${cxx_ldpath})
ENDIF("${cxx_path}" STREQUAL "")
ENDIF(WIN32)
ENDWHILE(NOT "${tempfiles}" STREQUAL "")
ENDIF()
ENDIF()
ENDWHILE()
SET_CORE("${cxx_binary_dir}")
ADD_TEST(Cxx${is_core}_${script} ${CMAKE_COMMAND}
......@@ -159,12 +159,12 @@ MACRO(ADD_MPI_TEST_CXX script files)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(Cxx${is_core}_${script}
PROPERTIES DEPENDS ${tdep} ${script})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDIF()
file(COPY
${cxx_source_dir}/${script}
DESTINATION ${cxx_binary_dir}/
)
ENDMACRO(ADD_MPI_TEST_CXX script files)
ENDMACRO()
# CXX Clean Macro
# Author: Brian Panneton
......@@ -176,7 +176,7 @@ MACRO(CLEAN_TEST_CXX executable)
set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${ARGN}
)
ENDMACRO(CLEAN_TEST_CXX executable)
ENDMACRO()
# Configure the cxx 'driver' file
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)
SET_PROPERTY(GLOBAL APPEND PROPERTY FORTRAN_TEST_DEPENDENCIES
"${dependencies}"
)
ENDIF(NOT ("${dependencies}" STREQUAL ""))
ENDMACRO(ADD_TEST_FORTRAN_DEPENDENCIES dependencies)
ENDIF()
ENDMACRO()
# Fortran Add LDPath Macro
# Author: Brian Panneton
......@@ -30,8 +30,8 @@ MACRO(ADD_TEST_FORTRAN_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY FORTRAN_TEST_LDPATH
"${ldpath}${sep}${ld}"
)
ENDIF("${ld}" STRGREATER "")
ENDMACRO(ADD_TEST_FORTRAN_LDPATH ld)
ENDIF()
ENDMACRO()
# Fortran Add Path Macro
# Author: Brian Panneton
......@@ -44,8 +44,8 @@ MACRO(ADD_TEST_FORTRAN_PATH p)
SET_PROPERTY(GLOBAL PROPERTY FORTRAN_TEST_PATH
"${path}${sep}${p}"
)
ENDIF("${p}" STRGREATER "")
ENDMACRO(ADD_TEST_FORTRAN_PATH p)
ENDIF()
ENDMACRO()
# Fortran Test Macro
# Author: Brian Panneton
......@@ -60,15 +60,15 @@ MACRO(ADD_TEST_FORTRAN executable)
IF(EXISTS ${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)
ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f90)
ENDIF(EXISTS ${fortran_source_dir}/${executable}.f90)
ENDIF()
IF(EXISTS ${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_ldpath GLOBAL PROPERTY FORTRAN_TEST_LDPATH)
......@@ -85,8 +85,8 @@ MACRO(ADD_TEST_FORTRAN executable)
IF("${fortran_path}" STREQUAL "")
SET(fortran_path ${fortran_ldpath})
ENDIF("${fortran_path}" STREQUAL "")
ENDIF(WIN32)
ENDIF()
ENDIF()
SET_CORE("${fortran_binary_dir}")
ADD_TEST(FORTRAN${is_core}_${executable}${dup} ${CMAKE_COMMAND}
......@@ -100,8 +100,8 @@ MACRO(ADD_TEST_FORTRAN executable)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(FORTRAN${is_core}_${executable}${dup}
PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDMACRO(ADD_TEST_FORTRAN executable)
ENDIF()
ENDMACRO()
# Fortran MPI Test Macro
# Author: Andrew Burns
......@@ -126,15 +126,15 @@ MACRO(ADD_MPI_TEST_FORTRAN script files)
IF(EXISTS ${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)
ADD_EXECUTABLE(${executable} ${fortran_source_dir}/${executable}.f90)
ENDIF(EXISTS ${fortran_source_dir}/${executable}.f90)
ENDIF()
IF(EXISTS ${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_ldpath GLOBAL PROPERTY FORTRAN_TEST_LDPATH)
......@@ -151,9 +151,9 @@ MACRO(ADD_MPI_TEST_FORTRAN script files)
IF("${fortran_path}" STREQUAL "")
SET(fortran_path ${fortran_ldpath})
ENDIF("${fortran_path}" STREQUAL "")
ENDIF(WIN32)
ENDWHILE(NOT "${tempfiles}" STREQUAL "")
ENDIF()
ENDIF()
ENDWHILE()
SET_CORE("${fortran_binary_dir}")
ADD_TEST(FORTRAN${is_core}_${script} ${CMAKE_COMMAND}
......@@ -167,12 +167,12 @@ MACRO(ADD_MPI_TEST_FORTRAN script files)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(FORTRAN${is_core}_${script}
PROPERTIES DEPENDS ${tdep} ${script})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDIF()
file(COPY
${fortran_source_dir}/${script}
DESTINATION ${fortran_binary_dir}/
)
ENDMACRO(ADD_MPI_TEST_FORTRAN script files)
ENDMACRO()
# Fortran Clean Macro
# Author: Brian Panneton
......@@ -184,7 +184,7 @@ MACRO(CLEAN_TEST_FORTRAN executable)
set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${ARGN}
)
ENDMACRO(CLEAN_TEST_FORTRAN executable)
ENDMACRO()
# Configure the Fortran 'driver' file
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)
SET_PROPERTY(GLOBAL APPEND PROPERTY JAVA_TEST_DEPENDENCIES
"${dependencies}"
)
ENDIF(NOT ("${dependencies}" STREQUAL ""))
ENDMACRO(ADD_TEST_JAVA_DEPENDENCIES dependencies)
ENDIF()
ENDMACRO()
# Java Add File Dependencies Macro
# Author: Brian Panneton
......@@ -28,8 +28,8 @@ MACRO(ADD_TEST_JAVA_FILE_DEPENDENCIES dependencies)
SET_PROPERTY(GLOBAL APPEND PROPERTY JAVA_TEST_FILE_DEPENDENCIES
"${dependencies}"
)
ENDIF(NOT ("${dependencies}" STREQUAL ""))
ENDMACRO(ADD_TEST_JAVA_FILE_DEPENDENCIES dependencies)
ENDIF()
ENDMACRO()
# Java Add Classpath Macro
# Author: Brian Panneton
......@@ -42,8 +42,8 @@ MACRO(ADD_TEST_JAVA_CLASSPATH cp)
SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_CLASSPATH
"${classpath}${sep}${cp}"
)
ENDIF(NOT ("${cp}" STREQUAL ""))
ENDMACRO(ADD_TEST_JAVA_CLASSPATH cp)
ENDIF()
ENDMACRO()
# Java Add LDPath Macro
# Author: Brian Panneton
......@@ -56,8 +56,8 @@ MACRO(ADD_TEST_JAVA_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_LDPATH
"${ldpath}${sep}${ld}"
)
ENDIF("${ld}" STRGREATER "")
ENDMACRO(ADD_TEST_JAVA_LDPATH ld)
ENDIF()
ENDMACRO()
# Java Add Path Macro
# Author: Brian Panneton
......@@ -70,8 +70,8 @@ MACRO(ADD_TEST_JAVA_PATH p)
SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_PATH
"${path}${sep}${p}"
)
ENDIF("${p}" STRGREATER "")
ENDMACRO(ADD_TEST_JAVA_PATH p)
ENDIF()
ENDMACRO()
# Add Java Test Macro
# Author: Brian Panneton
......@@ -109,8 +109,8 @@ MACRO(ADD_TEST_JAVA executable)
IF(WIN32)
IF("${java_path}" STREQUAL "")
SET(java_path ${java_ldpath})
ENDIF("${java_path}" STREQUAL "")
ENDIF(WIN32)
ENDIF()
ENDIF()
SET_CORE("${java_binary_dir}")
ADD_TEST(Java${is_core}_${executable}${dup} ${CMAKE_COMMAND}
......@@ -125,8 +125,8 @@ MACRO(ADD_TEST_JAVA executable)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(Java${is_core}_${executable}${dup}
PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDMACRO(ADD_TEST_JAVA executable)
ENDIF()
ENDMACRO()
# Java Clean Macro
# Author: Brian Panneton
......@@ -138,7 +138,7 @@ MACRO(CLEAN_TEST_JAVA executable)
set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${ARGN}
)
ENDMACRO(CLEAN_TEST_JAVA executable)
ENDMACRO()
# Java Create Target Macro
# Author: Brian Panneton
......@@ -147,7 +147,7 @@ ENDMACRO(CLEAN_TEST_JAVA executable)
MACRO(CREATE_TARGET_TEST_JAVA)
IF(EXISTS JavaCore_ALLTEST)
SET(JavaCore_ALLTEST JavaCore_ALLTEST)
ENDIF(EXISTS JavaCore_ALLTEST)
ENDIF()
GET_PROPERTY(java_dependencies GLOBAL PROPERTY JAVA_TEST_DEPENDENCIES)
......@@ -158,13 +158,13 @@ MACRO(CREATE_TARGET_TEST_JAVA)
IF(NOT ("${java_dependencies}" STREQUAL ""))
ADD_DEPENDENCIES(Java${is_core}_ALLTEST ${java_dependencies})
ENDIF(NOT ("${java_dependencies}" STREQUAL ""))
ENDIF()
IF(NOT ("${is_core}" STREQUAL ""))
SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_TARGETS "")
ENDIF(NOT ("${is_core}" STREQUAL ""))
ENDIF()
ENDMACRO(CREATE_TARGET_TEST_JAVA)
ENDMACRO()
# Configure the java 'driver' file
......
......@@ -15,8 +15,8 @@ MACRO(ADD_TEST_PYTHON_DEPENDENCIES dependencies)
SET_PROPERTY(GLOBAL APPEND PROPERTY PYTHON_TEST_DEPENDENCIES
"${dependencies}"
)
ENDIF(NOT ("${dependencies}" STREQUAL ""))
ENDMACRO(ADD_TEST_PYTHON_DEPENDENCIES dependencies)
ENDIF()
ENDMACRO()
# Python Add Dependencies Macro
# Author: Brian Panneton
......@@ -29,8 +29,8 @@ MACRO(ADD_TEST_PYTHON_FILE_DEPENDENCIES dependencies)
SET_PROPERTY(GLOBAL APPEND PROPERTY PYTHON_TEST_FILE_DEPENDENCIES
"${dependencies}"
)
ENDIF(NOT ("${dependencies}" STREQUAL ""))
ENDMACRO(ADD_TEST_PYTHON_FILE_DEPENDENCIES dependencies)
ENDIF()
ENDMACRO()
# Python Add PythonPath Macro
# Author: Brian Panneton
......@@ -43,8 +43,8 @@ MACRO(ADD_TEST_PYTHON_PYTHONPATH pyp)
SET_PROPERTY(GLOBAL PROPERTY PYTHON_TEST_PYTHONPATH
"${pythonpath}${sep}${pyp}"
)
ENDIF(NOT ("${pyp}" STREQUAL ""))
ENDMACRO(ADD_TEST_PYTHON_PYTHONPATH cp)
ENDIF()
ENDMACRO()
# Python Add LDPath Macro
# Author: Brian Panneton
......@@ -57,8 +57,8 @@ MACRO(ADD_TEST_PYTHON_LDPATH ld)
SET_PROPERTY(GLOBAL PROPERTY PYTHON_TEST_LDPATH
"${ldpath}${sep}${ld}"
)
ENDIF("${ld}" STRGREATER "")
ENDMACRO(ADD_TEST_PYTHON_LDPATH ld)
ENDIF()
ENDMACRO()
# Python Add Path Macro
# Author: Brian Panneton
......@@ -71,8 +71,8 @@ MACRO(ADD_TEST_PYTHON_PATH p)
SET_PROPERTY(GLOBAL PROPERTY PYTHON_TEST_PATH
"${path}${sep}${p}"
)
ENDIF("${p}" STRGREATER "")
ENDMACRO(ADD_TEST_PYTHON_PATH p)
ENDIF()
ENDMACRO()
# Add Python Test Macro
# Author: Brian Panneton
......@@ -113,8 +113,8 @@ MACRO(ADD_TEST_PYTHON executable)
IF(WIN32)
IF("${python_path}" STREQUAL "")
SET(python_path ${java_ldpath})
ENDIF("${python_path}" STREQUAL "")
ENDIF(WIN32)
ENDIF()
ENDIF()
SET_CORE("${python_binary_dir}")
ADD_TEST(Python${is_core}_${executable}${dup} ${CMAKE_COMMAND}
......@@ -129,9 +129,9 @@ MACRO(ADD_TEST_PYTHON executable)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(Python${is_core}_${executable}${dup}
PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDIF()
ENDMACRO(ADD_TEST_PYTHON executable)
ENDMACRO()
......@@ -155,8 +155,8 @@ MACRO(ADD_MPI_TEST_PYTHON script files)
IF(WIN32)
IF("${python_path}" STREQUAL "")
SET(python_path ${python_ldpath})
ENDIF("${python_path}" STREQUAL "")
ENDIF(WIN32)
ENDIF()
ENDIF()
set(tempfiles ${files})
......@@ -173,9 +173,9 @@ MACRO(ADD_MPI_TEST_PYTHON script files)
${python_source_dir}/${executable}.py
DESTINATION ${python_binary_dir}/
)
ENDIF(EXISTS ${python_source_dir}/${executable}.py)
ENDIF()
ENDWHILE(NOT "${tempfiles}" STREQUAL "")
ENDWHILE()
SET_CORE("${python_binary_dir}")
ADD_TEST(Python${is_core}_${script} ${CMAKE_COMMAND}
......@@ -190,12 +190,12 @@ MACRO(ADD_MPI_TEST_PYTHON script files)
IF(NOT "${tdep}" STREQUAL "")
SET_TESTS_PROPERTIES(Python${is_core}_${script}}
PROPERTIES DEPENDS ${tdep})
ENDIF(NOT "${tdep}" STREQUAL "")
ENDIF()
file(COPY
${python_source_dir}/${script}
DESTINATION ${python_binary_dir}/
)
ENDMACRO(ADD_MPI_TEST_PYTHON script files)
ENDMACRO()
......@@ -211,7 +211,7 @@ MACRO(CLEAN_TEST_PYTHON executable)
ADDITIONAL_MAKE_CLEAN_FILES ${ARGN}
${executable}.py
)
ENDMACRO(CLEAN_TEST_PYTHON executable)
ENDMACRO()
# Python Create Target Macro
......@@ -221,7 +221,7 @@ ENDMACRO(CLEAN_TEST_PYTHON executable)
MACRO(CREATE_TARGET_TEST_PYTHON)
IF(EXISTS PythonCore_ALLTEST)
SET(PythonCore_ALLTEST PythonCore_ALLTEST)
ENDIF(EXISTS PythonCore_ALLTEST)
ENDIF()
GET_PROPERTY(python_dependencies GLOBAL PROPERTY PYTHON_TEST_DEPENDENCIES)
......@@ -232,13 +232,13 @@ MACRO(CREATE_TARGET_TEST_PYTHON)
IF(NOT ("${python_dependencies}" STREQUAL ""))
ADD_DEPENDENCIES(Python${is_core}_ALLTEST ${python_dependencies})
ENDIF(NOT ("${python_dependencies}" STREQUAL ""))
ENDIF()
IF(NOT ("${is_core}" STREQUAL ""))
SET_PROPERTY(GLOBAL PROPERTY PYTHON_TEST_TARGETS "")
ENDIF(NOT ("${is_core}" STREQUAL ""))
ENDIF()
ENDMACRO(CREATE_TARGET_TEST_PYTHON)
ENDMACRO()
# Configure the python 'driver' file
......
......@@ -16,15 +16,15 @@ MESSAGE("| Call Output: End")
IF(c_error)
MESSAGE("| Call Error: Begin\n${c_error}")
MESSAGE("| Call Error: End")
ENDIF(c_error)
ENDIF()
MESSAGE("| Call Ended")
MESSAGE("----------------------------------------------------------")
# Let's make sure that if the test failed, it failed with CTest too
IF(c_error)
MESSAGE(SEND_ERROR "Test Failed.")
ENDIF(c_error)
ENDIF()
IF(NOT ${c_result} EQUAL "0")
MESSAGE(SEND_ERROR "Test Failed.")
ENDIF(NOT ${c_result} EQUAL "0")
ENDIF()
......@@ -16,15 +16,15 @@ MESSAGE("| Call Output: End")
IF(cxx_error)
MESSAGE("| Call Error: Begin\n${cxx_error}")
MESSAGE("| Call Error: End")
ENDIF(cxx_error)
ENDIF()
MESSAGE("| Call Ended")
MESSAGE("----------------------------------------------------------")
# Let's make sure that if the test failed, it failed with CTest too
IF(cxx_error)
MESSAGE(SEND_ERROR "Test Failed.")
ENDIF(cxx_error)
ENDIF()
IF(NOT ${cxx_result} EQUAL "0")
MESSAGE(SEND_ERROR "Test Failed.")
ENDIF(NOT ${cxx_result} EQUAL "0")
ENDIF()
......@@ -16,15 +16,15 @@ MESSAGE("| Call Output: End")
IF(fortran_error)
MESSAGE("| Call Error: Begin\n${fortran_error}")
MESSAGE("| Call Error: End")
ENDIF(fortran_error)
ENDIF()
MESSAGE("| Call Ended")
MESSAGE("----------------------------------------------------------")
# Let's make sure that if the test failed, it failed with CTest too
IF(fortran_error)
MESSAGE(SEND_ERROR "Test Failed.")
ENDIF(fortran_error)
ENDIF()
IF(NOT ${fortran_result} EQUAL "0")
MESSAGE(SEND_ERROR "Test Failed.")
ENDIF(NOT ${fortran_result} EQUAL "0")
ENDIF()
......@@ -20,14 +20,14 @@ MESSAGE("| Call Output: End")
IF(java_error)
MESSAGE("| Call Error: Begin\n${java_error}")
MESSAGE("| Call Error: End")
ENDIF(java_error)
ENDIF()
MESSAGE("| Call Ended")
MESSAGE("----------------------------------------------------------")
# Let's make sure that if the test failed, it failed with CTest too
IF(java_error)
MESSAGE(SEND_ERROR "Test Failed.")
ENDIF(java_error)
ENDIF()
IF(NOT "${java_result}" STREQUAL "0")
MESSAGE(SEND_ERROR "Result not zero.")
ENDIF(NOT "${java_result}" STREQUAL "0")
ENDIF()
......@@ -20,12 +20,12 @@ MESSAGE("| Call Output: End")
IF(python_error)
MESSAGE("Call Error: Begin\n${python_error}")
MESSAGE("Call Error: End")
ENDIF(python_error)
ENDIF()
MESSAGE("| Call Ended")
MESSAGE("----------------------------------------------------------")
# Let's make sure that if the test failed, it failed with CTest too
IF(python_result)
MESSAGE(SEND_ERROR "${python_result}")
ENDIF(python_result)
ENDIF()
......@@ -22,11 +22,11 @@ MESSAGE("| Call Output: End")
IF(python_error)
MESSAGE("Call Error: Begin\n${python_error}")
MESSAGE("Call Error: End")
ENDIF(python_error)
ENDIF()
MESSAGE("| Call Ended")
MESSAGE("----------------------------------------------------------")
# Let's make sure that if the test failed, it failed with CTest too
IF(python_result)
MESSAGE(SEND_ERROR "${python_result}")
ENDIF(python_result)
ENDIF()
......@@ -19,9 +19,9 @@ SET(defines
# Take care of Windows Path Seperators
IF(WIN32)
SET(sep ";")
ELSE(WIN32)
ELSE()
SET(sep ":")
ENDIF(WIN32)