diff --git a/src/Makefile.am b/src/Makefile.am index ea91917e9a2bc010fc4505fd7f259c4fd07cf391..9c841db1176df09ee5bcaa0e051f4f0ae97df518 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,15 +109,13 @@ version_string.h: version_string.h.in $(AM_SOURCES) $(include_HEADERS) $(noinst_ sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \ -e "s,@GIT_REVISION\@,$${GIT_REVISION}," \ -e "s|@GIT_BRANCH\@|$${GIT_BRANCH}|" \ - -e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" \ - -e "s|@SWIFT_CPPFLAGS\@|$(CPPFLAGS)|" $< > version_string.h; \ + -e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" $< > version_string.h; \ else \ if test ! -f version_string.h; then \ sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \ -e "s,@GIT_REVISION\@,unknown," \ -e "s,@GIT_BRANCH\@,unknown," \ - -e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" \ - -e "s|@SWIFT_CPPFLAGS\@|$(CPPLAGS)|" $< > version_string.h; \ + -e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" $< > version_string.h; \ fi; \ fi diff --git a/src/common_io.c b/src/common_io.c index 349c3cbf238f8ca2c7e510f273f7f78bee56a4dd..1f1ec401547c81e137b4e7d836ab58cb87280d8b 100644 --- a/src/common_io.c +++ b/src/common_io.c @@ -375,7 +375,6 @@ void writeCodeDescription(hid_t h_file) { writeAttribute_s(h_grpcode, "Git Revision", git_revision()); writeAttribute_s(h_grpcode, "Configuration options", configuration_options()); writeAttribute_s(h_grpcode, "CFLAGS", compilation_cflags()); - writeAttribute_s(h_grpcode, "CPPFLAGS", compilation_cppflags()); writeAttribute_s(h_grpcode, "HDF5 library version", hdf5_version()); #ifdef HAVE_FFTW writeAttribute_s(h_grpcode, "FFTW library version", fftw3_version()); diff --git a/src/version.c b/src/version.c index 66c575a11b1c29edad9676391c7f0671bac6fb59..c5b9255f6cab1fc716a035d3ef739b969a3ab4d4 100644 --- a/src/version.c +++ b/src/version.c @@ -149,25 +149,6 @@ const char *compilation_cflags(void) { return buf; } -/** - * @brief Return the CPPFLAGS the code was compiled with - * - * @result List of CPPFLAGS within simple quotes (') - */ -const char *compilation_cppflags(void) { - static char buf[1024]; - static int initialised = 0; - static const char *cppflags = SWIFT_CPPFLAGS; - if (!initialised) { - if (strlen(cppflags) < 1024 - 2) - sprintf(buf, "'%s'", cppflags); - else - error("SWIFT_CPPFLAGS string longer than buffer"); - initialised = 1; - } - return buf; -} - /** * @brief The version of SWIFT * @@ -356,7 +337,6 @@ void greetings(void) { printf(" Config. options: %s\n\n", configuration_options()); printf(" Compiler: %s, Version: %s\n", compiler_name(), compiler_version()); printf(" CFLAGS : %s\n", compilation_cflags()); - printf(" CPPFLAGS: %s\n", compilation_cppflags()); printf("\n"); #ifdef HAVE_HDF5 printf(" HDF5 library version: %s\n", hdf5_version()); diff --git a/src/version.h b/src/version.h index 26df5ccbf4484db85b28bcc62b1eb2c130e75b55..5fa057ec8675e9310364eaec3f5098404976e895 100644 --- a/src/version.h +++ b/src/version.h @@ -27,7 +27,6 @@ const char* git_revision(void); const char* git_branch(void); const char* configuration_options(void); const char* compilation_cflags(void); -const char* compilation_cppflags(void); const char* compiler_name(void); const char* compiler_version(void); const char* mpi_version(void); diff --git a/src/version_string.h.in b/src/version_string.h.in index cf4be7687cd08c1f5872df88dcde65bab85c1d24..2be9a84fd52bfe089917d4c0da874fa7ef2dce6b 100644 --- a/src/version_string.h.in +++ b/src/version_string.h.in @@ -29,6 +29,5 @@ #define GIT_REVISION "@GIT_REVISION@" #define GIT_BRANCH "@GIT_BRANCH@" #define SWIFT_CFLAGS "@SWIFT_CFLAGS@" -#define SWIFT_CPPFLAGS "@SWIFT_CPPFLAGS@" #endif /* SWIFT_VERSION_STRING_H */