From fe841b25159f162cb2cdf763440bff78e73d69eb Mon Sep 17 00:00:00 2001 From: "T.J. Corona" Date: Tue, 18 Apr 2017 13:44:26 -0400 Subject: [PATCH] Fix paths for testing from the superbuild. --- Source/Applications/ModelBuilder/CMakeLists.txt | 4 ++-- Source/Applications/SceneBuilder/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Applications/ModelBuilder/CMakeLists.txt b/Source/Applications/ModelBuilder/CMakeLists.txt index 8f46c3bd..22a95efa 100644 --- a/Source/Applications/ModelBuilder/CMakeLists.txt +++ b/Source/Applications/ModelBuilder/CMakeLists.txt @@ -602,7 +602,7 @@ endif() # Writes cmake file to run test function(test_with_text_file_output testname tempfile baselinefile envlist exepath exe) - set(testfile "${CMAKE_BINARY_DIR}/Run${testname}.cmake") + set(testfile "${PROJECT_BINARY_DIR}/Run${testname}.cmake") #message("testfile ${testfile} envlist ${envlist}") file(WRITE ${testfile} "set(fullexe \"${exepath}/${exe}\") @@ -642,7 +642,7 @@ endif() endif() ") - add_medium_test(${testname} ${CMAKE_COMMAND} -Dcfg=$ -P "${CMAKE_BINARY_DIR}/Run${testname}.cmake") + add_medium_test(${testname} ${CMAKE_COMMAND} -Dcfg=$ -P "${PROJECT_BINARY_DIR}/Run${testname}.cmake") endfunction() endif(BUILD_TESTING) diff --git a/Source/Applications/SceneBuilder/CMakeLists.txt b/Source/Applications/SceneBuilder/CMakeLists.txt index b2eaee46..cc2b542f 100644 --- a/Source/Applications/SceneBuilder/CMakeLists.txt +++ b/Source/Applications/SceneBuilder/CMakeLists.txt @@ -224,7 +224,7 @@ set (XML_TESTS_WITH_BASELINES endforeach(test) function(test_with_text_file_output testname tempfile baselinefile exepath1 exe1 args1 exepath2 exe2 args2) - file(WRITE "${CMAKE_BINARY_DIR}/Run${testname}.cmake" + file(WRITE "${PROJECT_BINARY_DIR}/Run${testname}.cmake" "set(fullexe1 \"${exepath1}/${exe1}\") if(NOT EXISTS \${fullexe1}) set(fullexe1 \"${exepath1}/\${cfg}/${exe1}\") @@ -245,7 +245,7 @@ if(NOT rv2 EQUAL 0) message(FATAL_ERROR \"ModelBuilder executable return value was \${rv2}\") endif()" ) - add_long_test(SceneBuilder${testname} COMMAND ${CMAKE_COMMAND} -Dcfg=$ -P "${CMAKE_BINARY_DIR}/Run${testname}.cmake") + add_long_test(SceneBuilder${testname} COMMAND ${CMAKE_COMMAND} -Dcfg=$ -P "${PROJECT_BINARY_DIR}/Run${testname}.cmake") endfunction() set(PROJECT_EXE ${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}) -- GitLab