From 1fc19a8f82ab55e86d8ef2390a400209557998eb Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 18 Sep 2013 14:21:27 +0000 Subject: [PATCH] Remove debug code git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30791 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CTestConfig.cmake | 3 +-- deal.II/run_testsuite.cmake | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deal.II/CTestConfig.cmake b/deal.II/CTestConfig.cmake index 901b102259..2713b51e4f 100644 --- a/deal.II/CTestConfig.cmake +++ b/deal.II/CTestConfig.cmake @@ -50,5 +50,4 @@ FIND_PROGRAM(HOSTNAME_COMMAND NAMES hostname) EXEC_PROGRAM(${HOSTNAME_COMMAND} OUTPUT_VARIABLE _hostname) SET(CTEST_SITE "${_hostname}") -SET(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR}-compiler") -MESSAGE(FATAL_ERROR "${CMAKE_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR}") +SET(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR}-todo") diff --git a/deal.II/run_testsuite.cmake b/deal.II/run_testsuite.cmake index 77541abdcc..9b6df3a5f3 100644 --- a/deal.II/run_testsuite.cmake +++ b/deal.II/run_testsuite.cmake @@ -52,9 +52,9 @@ IF("${CTEST_BINARY_DIRECTORY}" STREQUAL "") # If CTEST_BINARY_DIRECTORY is not set we just use the current directory # except it is equal to CTEST_SOURCE_DIRECTORY in which case we fail. # - SET(CTEST_BINARY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + SET(CTEST_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - IF("${CTEST_BINARY_DIRECTORY}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + IF("${CTEST_BINARY_DIRECTORY}" STREQUAL "${CTEST_SOURCE_DIR}") MESSAGE(FATAL_ERROR " ctest was invoked in the source directory and CTEST_BINARY_DIRECTORY is not set. Please either call ctest from within a designated build directory, or set CTEST_BINARY_DIRECTORY accordingly." -- 2.39.5