Skip to content
Snippets Groups Projects
Commit b89502fe authored by Simon Praetorius's avatar Simon Praetorius
Browse files

Do not link against dunegrid in tests manually

parent c3de81e7
No related branches found
No related tags found
No related merge requests found
Pipeline #63001 failed
Stage: .pre
Stage: test
Hide whitespace changes
Inline Side-by-side
dune/grid/common/test/CMakeLists.txt
+ 2
− 2
View file @ b89502fe
# SPDX-FileCopyrightText: Copyright © DUNE Project contributors, see file LICENSE.md in module root
# SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
dune_add_test(SOURCES scsgmappertest.cc LINK_LIBRARIES dunegrid)
dune_add_test(SOURCES mcmgmappertest.cc LINK_LIBRARIES dunegrid)
dune_add_test(SOURCES scsgmappertest.cc)
dune_add_test(SOURCES mcmgmappertest.cc)
dune/grid/io/file/dgfparser/test/CMakeLists.txt
+ 0
− 5
View file @ b89502fe
......@@ -3,20 +3,17 @@
dune_add_test(NAME test-dgf-yasp
SOURCES test-dgf-yasp.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
)
dune_add_test(NAME test-dgf-yasp-offset
SOURCES test-dgf-yasp.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
TESTCOORDINATES
CMD_ARGS ${PROJECT_SOURCE_DIR}/doc/grids/dgf/test2d_offset.dgf)
dune_add_test(NAME test-dgf-oned
SOURCES test-dgf-oned.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
)
......@@ -31,12 +28,10 @@ endif()
dune_add_test(NAME test-dgf-ug
SOURCES test-dgf-ug.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
CMAKE_GUARD dune-uggrid_FOUND)
dune_add_test(NAME test-dgf-gmsh-ug
SOURCES test-dgf-ug.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\" DGFTEST_USE_GMSH=1
CMAKE_GUARD dune-uggrid_FOUND)
dune/grid/io/file/test/CMakeLists.txt
+ 0
− 3
View file @ b89502fe
......@@ -26,20 +26,17 @@ dune_add_test(SOURCES vtktest.cc
dune_add_test(SOURCES vtksequencetest.cc)
dune_add_test(SOURCES starcdreadertest.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
CMAKE_GUARD dune-uggrid_FOUND)
# the gmsh tests
dune_add_test(NAME gmshtest-onedgrid
SOURCES gmshtest.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS GMSH_ONEDGRID
DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\")
dune_add_test(NAME gmshtest-uggrid
SOURCES gmshtest.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS GMSH_UGGRID
DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
CMAKE_GUARD dune-uggrid_FOUND)
......
dune/grid/test/CMakeLists.txt
+ 1
− 8
View file @ b89502fe
......@@ -9,7 +9,6 @@ dune_add_test(SOURCES geometrygrid-coordfunction-copyconstructor.cc)
dune_add_test(NAME test-geogrid-yaspgrid
SOURCES test-geogrid.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS COORDFUNCTION=IdenticalCoordFunction<double,2>
CACHECOORDFUNCTION=0
DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
......@@ -17,7 +16,6 @@ dune_add_test(NAME test-geogrid-yaspgrid
dune_add_test(NAME test-geogrid-uggrid
SOURCES test-geogrid.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS COORDFUNCTION=IdenticalCoordFunction<double,2>
CACHECOORDFUNCTION=0
DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
......@@ -28,8 +26,7 @@ dune_add_test(SOURCES test-gridinfo.cc)
dune_add_test(SOURCES test-identitygrid.cc)
dune_add_test(SOURCES test-oned.cc
LINK_LIBRARIES dunegrid)
dune_add_test(SOURCES test-oned.cc)
dune_add_test(SOURCES test-mcmg-geogrid.cc)
......@@ -38,24 +35,20 @@ dune_add_test(SOURCES testiteratorranges.cc)
dune_add_test(SOURCES test-hierarchicsearch.cc)
dune_add_test(SOURCES test-ug.cc
LINK_LIBRARIES dunegrid
COMPILE_DEFINITIONS DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\"
CMAKE_GUARD dune-uggrid_FOUND)
dune_add_test(SOURCES test-parallel-ug.cc
LINK_LIBRARIES dunegrid
CMAKE_GUARD dune-uggrid_FOUND
MPI_RANKS 1 2 3 4 8
TIMEOUT 300)
add_dune_mpi_flags(test-parallel-ug)
dune_add_test(SOURCES test-loadbalancing.cc
LINK_LIBRARIES dunegrid
CMAKE_GUARD dune-uggrid_FOUND)
add_dune_parmetis_flags(test-loadbalancing)
dune_add_test(SOURCES issue-53-uggrid-intersections.cc
LINK_LIBRARIES dunegrid
CMAKE_GUARD dune-uggrid_FOUND)
# The alberta tests are only alibi-ported, until the grid and world dimension
......
dune/grid/utility/test/CMakeLists.txt
+ 5
− 10
View file @ b89502fe
# SPDX-FileCopyrightText: Copyright © DUNE Project contributors, see file LICENSE.md in module root
# SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
dune_add_test(SOURCES globalindexsettest.cc
LINK_LIBRARIES dunegrid)
dune_add_test(SOURCES globalindexsettest.cc)
dune_add_test(SOURCES persistentcontainertest.cc
LINK_LIBRARIES dunegrid)
dune_add_test(SOURCES persistentcontainertest.cc)
dune_add_test(SOURCES structuredgridfactorytest.cc
LINK_LIBRARIES dunegrid)
dune_add_test(SOURCES structuredgridfactorytest.cc)
dune_add_test(SOURCES tensorgridfactorytest.cc
LINK_LIBRARIES dunegrid)
dune_add_test(SOURCES tensorgridfactorytest.cc)
dune_add_test(SOURCES vertexordertest.cc
LINK_LIBRARIES dunegrid)
dune_add_test(SOURCES vertexordertest.cc)
python/dune/grid/CMakeLists.txt
+ 1
− 1
View file @ b89502fe
......@@ -12,7 +12,7 @@ add_python_targets(grid
datahandle
)
dune_add_pybind11_module(NAME _grid)
set_property(TARGET _grid PROPERTY LINK_LIBRARIES Dune::Grid APPEND)
target_link_libraries(_grid PUBLIC Dune::Grid)
if(SKBUILD)
install(TARGETS _grid LIBRARY DESTINATION python/dune/grid)
endif()
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment