Commit d3db082a authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kenneth Moreland

Changes to fix path on Windows were failing on Linux. Fixed that.

Setting C_TEST_PATH to include the configuration type only for generators
supporting multiple configurations.

C_TEST_PATH is now complete and correct. So all tests can simply use it without
worry about platforms or generators.
parent 255c0879
......@@ -32,6 +32,13 @@ SET(ICET_LIBRARY_DIR ${LIBRARY_OUTPUT_PATH})
SET(ICET_EXECUTABLE_DIR ${EXECUTABLE_OUTPUT_PATH})
SET(C_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
# CMAKE_CONFIGURATION_TYPES is set for generators that support multiple
# configurations e.g. Visual Studio. In that case we update the C_TEST_PATH to
# include the configuration type (CTEST_CONFIGURATION_TYPE)
IF (CMAKE_CONFIGURATION_TYPES)
SET (C_TEST_PATH ${C_TEST_PATH}/\${CTEST_CONFIGURATION_TYPE})
ENDIF(CMAKE_CONFIGURATION_TYPES)
SET(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
${CMAKE_SOURCE_DIR}/cmake
......
......@@ -80,7 +80,7 @@ FOREACH (test ${MyTests})
GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
ADD_TEST(IceT${TName}
${PRE_TEST_FLAGS}
${C_TEST_PATH}/\${CTEST_CONFIGURATION_TYPE}/icetTests_mpi ${ICET_TEST_FLAGS} ${TName}
${C_TEST_PATH}/icetTests_mpi ${ICET_TEST_FLAGS} ${TName}
${POST_TEST_FLAGS})
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.1)
SET_TESTS_PROPERTIES(IceT${TName}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment