From 4d6f64b2b57f6d714fa149f2ec74b70eef25d832 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 19 Aug 2013 02:03:27 +0000 Subject: [PATCH] Intermdiate git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30340 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_deal_ii_add_test.cmake | 9 +++++++-- tests/CMakeLists.txt | 5 ++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake index d19ca77bf3..9ebd61efc1 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake @@ -28,6 +28,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_target) STRING(TOLOWER ${_build} _build_lowercase) ADD_EXECUTABLE(${_test_target}.${_build_lowercase} + EXCLUDE_FROM_ALL ${_test_target}.cc ) SET_TARGET_PROPERTIES(${_test_target}.${_build_lowercase} PROPERTIES @@ -36,15 +37,19 @@ MACRO(DEAL_II_ADD_TEST _category _test_target) COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${_build}}" LINKER_LANGUAGE "CXX" ) - SET_PROPERTY(TARGET ${_target} APPEND PROPERTY + SET_PROPERTY(TARGET ${_test_target}.${_build_lowercase} APPEND PROPERTY INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/include" "${CMAKE_SOURCE_DIR}/include" ) - TARGET_LINK_LIBRARIES(${_test_target}.${_build_lowercase} ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX} ) + + ADD_TEST(${_test_target}.${_build_lowercase}.build + ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${_test_target}.${_build_lowercase} + ) + ENDIF() ENDFOREACH() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 21aa49c925..56cf69c9b5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,4 @@ MESSAGE(STATUS "Registering tests") ADD_SUBDIRECTORY(base) -ADD_SUBDIRECTORY(bits) -ADD_SUBDIRECTORY(fe) -MESSAGE(STATUS "Tests") +#ADD_SUBDIRECTORY(bits) +#ADD_SUBDIRECTORY(fe) -- 2.39.5