From f255b459fafab9d304df225c77db2a68c75b5855 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Fri, 9 Feb 2018 16:37:47 +0000 Subject: [PATCH] bugfix for ctest it is able now to load the modules but fails to load the data because it picks the wrong directory --- SuperBuild.cmake | 2 +- SuperBuild/External_Armadillo.cmake | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SuperBuild.cmake b/SuperBuild.cmake index d937318a..25968b41 100644 --- a/SuperBuild.cmake +++ b/SuperBuild.cmake @@ -209,4 +209,4 @@ configure_file(env_ccppetmr.csh.in ${CCPPETMR_INSTALL}/bin/env_ccppetmr.csh) enable_testing() add_test(NAME SIRF_TESTS COMMAND ${CMAKE_CTEST_COMMAND} -C $ - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Build/SIRF/) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/builds/SIRF/build/) diff --git a/SuperBuild/External_Armadillo.cmake b/SuperBuild/External_Armadillo.cmake index 1849e6cf..da9f6b1f 100644 --- a/SuperBuild/External_Armadillo.cmake +++ b/SuperBuild/External_Armadillo.cmake @@ -1,7 +1,9 @@ #======================================================================== # Author: Benjamin A Thomas # Author: Kris Thielemans +# Author: Edoardo Pasca # Copyright 2017 University College London +# Copyright 2017 Science Technology Facilities Council # # This file is part of the CCP PETMR Synergistic Image Reconstruction Framework (SIRF) SuperBuild. #