From a46de680247ed670372d0f39ac8d26718c6d02bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org> Date: Wed, 22 Jul 2015 08:39:58 +0200 Subject: [PATCH] [release][CMake] Build eigenvaluestest iff LAPACK found. --- dune/common/test/CMakeLists.txt | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dune/common/test/CMakeLists.txt b/dune/common/test/CMakeLists.txt index d44d03cdc..4a9a85876 100644 --- a/dune/common/test/CMakeLists.txt +++ b/dune/common/test/CMakeLists.txt @@ -10,7 +10,6 @@ set(TESTS diagonalmatrixtest dynmatrixtest dynvectortest - eigenvaluestest enumsettest fmatrixtest fvectortest @@ -52,13 +51,6 @@ set(COMPILEFAILTESTS genericiterator_compile_fail nullptr-test-fail) -set(TESTPROGS ${TESTS} ${FAILTESTS}) - -# We do not want want to build the tests during make all, -# but just build them on demand -add_directory_test_target(_test_target) -add_dependencies(${_test_target} ${TESTPROGS}) - # Add the executables needed for the tests add_executable("arraylisttest" arraylisttest.cc) add_executable("arraytest" arraytest.cc) @@ -81,9 +73,12 @@ target_link_libraries("dynmatrixtest" "dunecommon") add_executable("dynvectortest" dynvectortest.cc) -add_executable("eigenvaluestest" eigenvaluestest.cc) -target_link_libraries(eigenvaluestest dunecommon) -target_link_libraries(eigenvaluestest ${LAPACK_LIBRARIES}) +if(${HAVE_LAPACK}) + add_executable(eigenvaluestest eigenvaluestest.cc) + target_link_libraries(eigenvaluestest dunecommon) + target_link_libraries(eigenvaluestest ${LAPACK_LIBRARIES}) + list(APPEND TESTS eigenvaluestest) +endif() add_executable("diagonalmatrixtest" diagonalmatrixtest.cc) target_link_libraries("diagonalmatrixtest" "dunecommon") @@ -171,6 +166,13 @@ add_executable("tuplestest" tuplestest.cc) add_executable("tupleutilitytest" tupleutilitytest.cc) add_executable("utilitytest" utilitytest.cc) +set(TESTPROGS ${TESTS} ${FAILTESTS}) + +# We do not want want to build the tests during make all, +# but just build them on demand +add_directory_test_target(_test_target) +add_dependencies(${_test_target} ${TESTPROGS}) + # Add the tests to be executed foreach(_TEST ${TESTPROGS}) add_test(${_TEST} ${_TEST}) @@ -178,10 +180,13 @@ endforeach(_TEST) # treat tests returning code 77 as skipped set_tests_properties( - eigenvaluestest mpicollectivecommunication parametertreelocaletest PROPERTIES SKIP_RETURN_CODE 77) +if(${HAVE_LAPACK}) + set_tests_properties(eigenvaluestest + PROPERTIES SKIP_RETURN_CODE 77) +endif() # set properties for failing tests set_tests_properties( -- GitLab