From f2cb71976fb7eebac81acbe7b48cd3444d887599 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Fri, 5 Apr 2019 11:09:30 +0200
Subject: [PATCH] add_generated_executable -> dune_add_generated_executable
---
cmake/modules/DuneCodegenMacros.cmake | 10 +++++-----
cmake/modules/GeneratedSystemtests.cmake | 18 +++++++++---------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/cmake/modules/DuneCodegenMacros.cmake b/cmake/modules/DuneCodegenMacros.cmake
index c4734857..da322586 100644
--- a/cmake/modules/DuneCodegenMacros.cmake
+++ b/cmake/modules/DuneCodegenMacros.cmake
@@ -1,6 +1,6 @@
# File for module specific CMake tests.
#
-# .. cmake_function:: add_generated_executable
+# .. cmake_function:: dune_add_generated_executable
#
# .. cmake_param:: UFLFILE
# :single:
@@ -105,7 +105,7 @@ else()
endif()
file(GLOB_RECURSE UFL2PDELAB_SOURCES ${UFL2PDELAB_GLOB_PATTERN})
-function(add_generated_executable)
+function(dune_add_generated_executable)
set(OPTIONS EXCLUDE_FROM_ALL ANALYZE_GRID)
set(SINGLE TARGET SOURCE UFLFILE INIFILE)
set(MULTI FORM_COMPILER_ARGS DEPENDS ANALYZE_GRID_COMMAND)
@@ -113,15 +113,15 @@ function(add_generated_executable)
cmake_parse_arguments(GEN "${OPTIONS}" "${SINGLE}" "${MULTI}" ${ARGN})
if(GEN_UNPARSED_ARGUMENTS)
- message(FATAL_ERROR "Unrecognized arguments in add_generated_executable. This usually indicates a typo.")
+ message(FATAL_ERROR "Unrecognized arguments in dune_add_generated_executable. This usually indicates a typo.")
endif()
# Apply defaults and enforce requirements
if(NOT GEN_TARGET)
- message(FATAL_ERROR "Need to specify the TARGET parameter for add_generated_executable")
+ message(FATAL_ERROR "Need to specify the TARGET parameter for dune_add_generated_executable")
endif()
if(NOT GEN_UFLFILE)
- message(FATAL_ERROR "Need to specify the UFLFILE parameter for add_generated_executable")
+ message(FATAL_ERROR "Need to specify the UFLFILE parameter for dune_add_generated_executable")
endif()
if(NOT IS_ABSOLUTE ${GEN_UFLFILE})
set(GEN_UFLFILE ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_UFLFILE})
diff --git a/cmake/modules/GeneratedSystemtests.cmake b/cmake/modules/GeneratedSystemtests.cmake
index fd401b9f..87af7161 100644
--- a/cmake/modules/GeneratedSystemtests.cmake
+++ b/cmake/modules/GeneratedSystemtests.cmake
@@ -133,15 +133,15 @@ function(dune_add_formcompiler_system_test)
endif()
endif()
- add_generated_executable(TARGET ${tname}
- UFLFILE ${SYSTEMTEST_UFLFILE}
- INIFILE "${CMAKE_CURRENT_BINARY_DIR}/${inifile}"
- DEPENDS ${SYSTEMTEST_INIFILE} ${SYSTEMTEST_DEPENDS}
- EXCLUDE_FROM_ALL
- ${SOURCE}
- ${ANALYZE_GRID_STR}
- ${ANALYZE_GRID_COMMAND_STR}
- )
+ dune_add_generated_executable(TARGET ${tname}
+ UFLFILE ${SYSTEMTEST_UFLFILE}
+ INIFILE "${CMAKE_CURRENT_BINARY_DIR}/${inifile}"
+ DEPENDS ${SYSTEMTEST_INIFILE} ${SYSTEMTEST_DEPENDS}
+ EXCLUDE_FROM_ALL
+ ${SOURCE}
+ ${ANALYZE_GRID_STR}
+ ${ANALYZE_GRID_COMMAND_STR}
+ )
# Enrich the target with preprocessor variables from the __static section
# just the way that dune-testtools does.
--
GitLab