[libraries] create single xt library, fix dependencies

CMakeLists.txt

@@ -58,14 +58,7 @@ execute_process(COMMAND ${CMAKE_SOURCE_DIR}/getRevision.sh
                 ERROR_VARIABLE shell_error
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-dune_enable_all_packages(INCLUDE_DIRS
-                         ${dune-xt-common_SOURCE_DIR}/dune
-                         MODULE_LIBRARIES
-                         dunextcommon
-                         dunextgrid
-                         dunextfunctions
-                         dunextla
-                         gtest_dune_xt_common)
+dune_enable_all_packages(INCLUDE_DIRS ${dune-xt-common_SOURCE_DIR}/dune MODULE_LIBRARIES gtest_dune_xt dunext)
 
 include(DunePybindxiInstallPythonPackage)
 # this symlinks all files in python/ to the binary dir and install into the virtualenv from there thereby making the

cmake/modules/DuneXTTesting.cmake

@@ -57,7 +57,7 @@ macro(get_headercheck_targets subdir)
 endmacro(get_headercheck_targets)
 
 macro(add_subdir_tests subdir)
-  set(link_xt_libs dunextgrid dunextcommon dunextla)
+  set(link_xt_libs dunext)
   list(APPEND dxt_test_dirs ${subdir})
   file(GLOB_RECURSE test_sources "${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/*.cc")
   foreach(source ${test_sources})
@@ -87,7 +87,7 @@ macro(add_subdir_tests subdir)
                              dune_xt_execute.py
                              ${DEBUG_MACRO_TESTS})
         foreach(target ${targetlist_${testbase}})
-          target_link_libraries(${target} ${link_xt_libs} ${COMMON_LIBS} ${GRID_LIBS} gtest_dune_xt_common)
+          target_link_libraries(${target} ${link_xt_libs} ${COMMON_LIBS} ${GRID_LIBS} gtest_dune_xt)
           list(APPEND ${subdir}_dxt_test_binaries ${target})
           set(dxt_test_names_${target} ${testlist_${testbase}_${target}})
         endforeach(target)
@@ -105,7 +105,7 @@ macro(add_subdir_tests subdir)
                     ${link_xt_libs}
                     ${COMMON_LIBS}
                     ${GRID_LIBS}
-                    gtest_dune_xt_common
+                    gtest_dune_xt
                     COMMAND
                     ${CMAKE_BINARY_DIR}/run-in-dune-env
                     CMD_ARGS
@@ -195,7 +195,7 @@ macro(add_subdir_tests subdir)
                     ${link_xt_libs}
                     ${COMMON_LIBS}
                     ${GRID_LIBS}
-                    gtest_dune_xt_common
+                    gtest_dune_xt
                     COMMAND
                     ${CMAKE_BINARY_DIR}/run-in-dune-env
                     CMD_ARGS

dune/xt/common/CMakeLists.txt

@@ -37,6 +37,6 @@ set(lib_dune_xt_common_sources
     timedlogging.cc
     timings.cc)
 
-dune_library_add_sources(dunextcommon SOURCES ${lib_dune_xt_common_sources})
+dune_library_add_sources(dunext SOURCES ${lib_dune_xt_common_sources})
 
 add_analyze(${lib_dune_xt_common_sources})

dune/xt/functions/CMakeLists.txt

@@ -13,4 +13,4 @@
 # ~~~
 
 set(lib_dune_xt_functions_sources expression/mathexpr.cc)
-dune_library_add_sources(dunextfunctions SOURCES ${lib_dune_xt_functions_sources})
+dune_library_add_sources(dunext SOURCES ${lib_dune_xt_functions_sources})

dune/xt/grid/CMakeLists.txt

@@ -28,5 +28,5 @@ if(DUNE_XT_WITH_PYTHON_BINDINGS)
               walker.lib/yasp_2d_equidistant_offset.cc
               walker.lib/yasp_3d_equidistant_offset.cc)
 endif()
-dune_library_add_sources(dunextgrid SOURCES ${lib_dune_xt_grid_sources})
+dune_library_add_sources(dunext SOURCES ${lib_dune_xt_grid_sources})
 add_dune_alberta_flags(GRIDDIM 1 SOURCE_ONLY dunextgrid)

dune/xt/la/CMakeLists.txt

@@ -25,4 +25,4 @@ if(DUNE_XT_WITH_PYTHON_BINDINGS)
 endif()
 
 find_package(LAPACKE)
-dune_library_add_sources(dunextla SOURCES ${lib_dune_xt_la_sources})
+dune_library_add_sources(dunext SOURCES ${lib_dune_xt_la_sources})

dune/xt/test/CMakeLists.txt

@@ -16,7 +16,7 @@ enable_testing()
 dependencycheck(${xtcommon})
 
 include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/gtest)
-dune_library_add_sources(gtest_dune_xt_common SOURCES common.cxx gtest/gtest-all.cxx)
+dune_library_add_sources(gtest_dune_xt SOURCES common.cxx gtest/gtest-all.cxx)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gtest
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/xt/test/