From ef108fbb3fa09ad7a0ba143b706f64c7043f1918 Mon Sep 17 00:00:00 2001 From: Rene Milk <rene.milk@wwu.de> Date: Thu, 27 Oct 2016 15:04:52 +0200 Subject: [PATCH] [cmake] adjust for new test wrapper script name --- CMakeLists.txt | 4 ---- cmake/modules/DuneUtils.cmake | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83933ad2b..e9a4da898 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,10 +90,6 @@ dune_enable_all_packages(INCLUDE_DIRS ${dune-xt-common_SOURCE_DIR}/dune include(DuneUtils) include(GridUtils) -# add symlink for dune_execute.py to build-directory to be able to access it from other (xt-) modules -file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -dune_symlink_to_source_files(FILES bin/dune_execute.py) - add_header_listing() make_dependent_modules_sys_included() diff --git a/cmake/modules/DuneUtils.cmake b/cmake/modules/DuneUtils.cmake index f7ab52989..223535046 100644 --- a/cmake/modules/DuneUtils.cmake +++ b/cmake/modules/DuneUtils.cmake @@ -39,7 +39,7 @@ macro(BEGIN_TESTCASES) BASENAME test_${testbase} CREATED_TARGETS targetlist_${testbase} ADDED_TESTS testlist_${testbase} - SCRIPT ${dune-xt-common-path}/bin/dune_execute.py + SCRIPT dune_xt_execute.py ${DEBUG_MACRO_TESTS}) foreach(target ${targetlist_${testbase}}) target_link_libraries( ${target} ${ARGN} ${COMMON_LIBS} ${GRID_LIBS} gtest_dune_xt_common ) -- GitLab