From 497af3f4a1d9a6903ed0d94c7d2ad35292e06440 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 4 Mar 2015 12:44:34 +0100
Subject: [PATCH] Do not convert hyphens to underscores in the name of the
example .cc program
Each module constructed by duneproject contains a little Hello-world example
program. The name of the program used to be the name of the module with .cc
appended AND all hyphens replaced by underscores. Hence a module dune-foo
would containt the program dune_foo.cc. This patch removes that displacement.
Rationale:
- I see no reason for the replacement in the first place
- File names with hyphens appear to be much more common in Dune world than
file names with underscores.
---
bin/duneproject | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/bin/duneproject b/bin/duneproject
index 520079508..fcab3853c 100755
--- a/bin/duneproject
+++ b/bin/duneproject
@@ -329,7 +329,7 @@ cat > "$PROJECT/configure.ac" <<C_DELIM
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.62])
DUNE_AC_INIT # gets module version from dune.module file
-AC_CONFIG_SRCDIR([src/$CMODULE.cc])
+AC_CONFIG_SRCDIR([src/$MODULE.cc])
AC_CONFIG_HEADERS([config.h])
# we need no more than the standard DE-stuff
@@ -603,7 +603,7 @@ mkdir "$PROJECT/src"
echo "- $PROJECT/src/CMakeLists.txt"
cat> "$PROJECT/src/CMakeLists.txt" << M_DELIM
-add_executable("${CMODULE}" ${CMODULE}.cc)
+add_executable("${CMODULE}" ${MODULE}.cc)
target_link_dune_default_libraries("${CMODULE}")
M_DELIM
@@ -617,7 +617,7 @@ SUBDIRS =
noinst_PROGRAMS = ${CMODULE}
-${CMODULE}_SOURCES = $CMODULE.cc
+${CMODULE}_SOURCES = $MODULE.cc
${CMODULE}_CPPFLAGS = \$(AM_CPPFLAGS) \\
\$(DUNEMPICPPFLAGS) \\
@@ -656,8 +656,8 @@ include \$(top_srcdir)/am/global-rules
M_DELIM
################## PROJECT.CC ##################
-echo "- $PROJECT/src/$CMODULE.cc"
-cat> "$PROJECT/src/$CMODULE.cc" << CC_DELIM
+echo "- $PROJECT/src/$MODULE.cc"
+cat> "$PROJECT/src/$MODULE.cc" << CC_DELIM
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
--
GitLab