Skip to content
Snippets Groups Projects
Commit df04fa71 authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

[cmake] Deprecate dune_list_filter

We require CMake 3.13.
parent edef3eae
No related branches found
No related tags found
No related merge requests found
......@@ -22,6 +22,9 @@
without a Fortran compiler. So a Fortran compiler is no longer a built
requirement.
- `dune_list_filter` is deprecated and will be removed after Dune 2.8. Use
`list(FILTER ...)` introduced by CMake 3.6 instead.
- Remove the CMake options `DUNE_BUILD_BOTH_LIBS` and
`DUNE_USE_ONLY_STATIC_LIBS`. Use the default CMake way instead by
setting `BUILD_SHARED_LIBS` accordingly. Building both static
......
......@@ -49,6 +49,8 @@
# list(FILTER...) was introduced in cmake 3.6, this is a compatibility
# implementation for earlier cmakes
function(dune_list_filter list mode REGEX regular_expression)
message(DEPRECATION "dune_list_filter is deprecated and will be removed after Dune 2.8. Use list(FILTER ...) from CMake 3.6")
# validate arguments
if(NOT (("${mode}" STREQUAL "INCLUDE") OR ("${mode}" STREQUAL "EXCLUDE")))
message(FATAL_ERROR "unsupported mode '${mode}', must be either INCLUDE or EXCLUDE")
......
......@@ -75,7 +75,7 @@
#
# dune_instance_end()
#
# dune_list_filter(DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
# list(FILTER DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
# dune_add_test(NAME mytest
# SOURCES ${DUNE_INSTANCE_GENERATED})
#
......
......@@ -29,7 +29,7 @@ foreach(SCALAR IN LISTS TYPES)
endforeach()
dune_instance_end()
dune_list_filter(DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
list(FILTER DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
dune_add_test(NAME looptest
SOURCES ${DUNE_INSTANCE_GENERATED}
LINK_LIBRARIES dunecommon
......@@ -54,7 +54,7 @@ foreach(SCALAR IN LISTS TYPES)
endforeach()
dune_instance_end()
dune_list_filter(DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
list(FILTER DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
dune_add_test(NAME standardtest
SOURCES ${DUNE_INSTANCE_GENERATED}
LINK_LIBRARIES dunecommon
......@@ -80,7 +80,7 @@ foreach(SCALAR IN LISTS VCTEST_TYPES)
endforeach()
endforeach()
dune_instance_end()
dune_list_filter(DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
list(FILTER DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
dune_add_test(NAME vcarraytest
SOURCES ${DUNE_INSTANCE_GENERATED}
LINK_LIBRARIES dunecommon
......@@ -103,7 +103,7 @@ foreach(SCALAR IN LISTS VCTEST_TYPES)
endforeach()
endforeach()
dune_instance_end()
dune_list_filter(DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
list(FILTER DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
dune_add_test(NAME vcvectortest
SOURCES ${DUNE_INSTANCE_GENERATED}
LINK_LIBRARIES dunecommon
......
......@@ -104,7 +104,7 @@ foreach(SCALAR IN ITEMS double bool)
endforeach()
endforeach()
dune_instance_end()
dune_list_filter(DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
list(FILTER DUNE_INSTANCE_GENERATED INCLUDE REGEX [[\.cc$]])
dune_add_test(NAME debugalignsimdtest
SOURCES ${DUNE_INSTANCE_GENERATED}
LINK_LIBRARIES dunecommon
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment