Record CPPFLAGS (for @jwillis) and not CXXFLAGS.

src/Makefile.am

@@ -110,14 +110,14 @@ version_string.h: version_string.h.in $(AM_SOURCES) $(include_HEADERS) $(noinst_
 	        -e "s,@GIT_REVISION\@,$${GIT_REVISION}," \
 	        -e "s|@GIT_BRANCH\@|$${GIT_BRANCH}|" \
 	        -e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" \
-	        -e "s|@SWIFT_CXXFLAGS\@|$(CXXFLAGS)|" $< > version_string.h; \
+	        -e "s|@SWIFT_CPPFLAGS\@|$(CPPFLAGS)|" $< > 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_CXXFLAGS\@|$(CXXFLAGS)|" $< > version_string.h; \
+	            -e "s|@SWIFT_CPPFLAGS\@|$(CPPLAGS)|" $< > version_string.h; \
 	    fi; \
 	fi
 

src/common_io.c

@@ -375,7 +375,7 @@ 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, "CXXFLAGS", compilation_cxxflags());
+  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());

src/version.c

@@ -154,10 +154,10 @@ const char *compilation_cflags(void) {
  *
  * @result List of CPPFLAGS within simple quotes (')
  */
-const char *compilation_cxxflags(void) {
+const char *compilation_cppflags(void) {
   static char buf[1024];
   static int initialised = 0;
-  static const char *cppflags = SWIFT_CXXFLAGS;
+  static const char *cppflags = SWIFT_CPPFLAGS;
   if (!initialised) {
     if (strlen(cppflags) < 1024 - 2)
       sprintf(buf, "'%s'", cppflags);
@@ -356,7 +356,7 @@ 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(" CXXFLAGS: %s\n", compilation_cxxflags());
+  printf(" CPPFLAGS: %s\n", compilation_cppflags());
   printf("\n");
 #ifdef HAVE_HDF5
   printf(" HDF5 library version: %s\n", hdf5_version());

src/version.h

@@ -27,7 +27,7 @@ const char* git_revision(void);
 const char* git_branch(void);
 const char* configuration_options(void);
 const char* compilation_cflags(void);
-const char* compilation_cxxflags(void);
+const char* compilation_cppflags(void);
 const char* compiler_name(void);
 const char* compiler_version(void);
 const char* mpi_version(void);

src/version_string.h.in

@@ -29,6 +29,6 @@
 #define GIT_REVISION "@GIT_REVISION@"
 #define GIT_BRANCH "@GIT_BRANCH@"
 #define SWIFT_CFLAGS "@SWIFT_CFLAGS@"
-#define SWIFT_CXXFLAGS "@SWIFT_CXXFLAGS@"
+#define SWIFT_CPPFLAGS "@SWIFT_CPPFLAGS@"
 
 #endif /* SWIFT_VERSION_STRING_H */