From 813ce3715a10e8a5aa755dffa24d5dd8685c12ca Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Wed, 6 Dec 2017 14:10:10 +0100 Subject: [PATCH] GMSH_EXECUTABLE -> DEAL_II_GMSH_EXECUTABLE_PATH Now the definition stores directly a string, so that is immediately accessible, without the need to STRINGIFY it. --- include/deal.II/base/config.h.in | 2 +- tests/gmsh/create_tria_01.cc | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index cb6b5c4a70..9c6f991cbb 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -198,7 +198,7 @@ * gmsh: */ #ifdef DEAL_II_WITH_GMSH -# define GMSH_EXECUTABLE @GMSH_EXECUTABLE@ +# define DEAL_II_GMSH_EXECUTABLE_PATH "@GMSH_EXECUTABLE@" #endif /* diff --git a/tests/gmsh/create_tria_01.cc b/tests/gmsh/create_tria_01.cc index 96327afe64..41ed72b2c8 100644 --- a/tests/gmsh/create_tria_01.cc +++ b/tests/gmsh/create_tria_01.cc @@ -14,9 +14,6 @@ #include "../tests.h" -#define STRINGIFY(x) #x -#define TOSTRING(x) STRINGIFY(x) - int main () { initlog(); @@ -39,7 +36,7 @@ int main () geo.close(); - std::system(TOSTRING(GMSH_EXECUTABLE) " -2 file.geo 1>file.log 2>file_warn.log"); + std::system(DEAL_II_GMSH_EXECUTABLE_PATH " -2 file.geo 1>file.log 2>file_warn.log"); cat_file("file.msh"); -- 2.39.5