Skip to content
Snippets Groups Projects
Commit a0e45903 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Removed the collection of the CPPFLAGS.

parent f1788d3d
No related branches found
No related tags found
1 merge request!285Added the configuration command line and CFLAGS/CXXFLAGS to the snapshots and greeting message.
...@@ -109,15 +109,13 @@ version_string.h: version_string.h.in $(AM_SOURCES) $(include_HEADERS) $(noinst_ ...@@ -109,15 +109,13 @@ version_string.h: version_string.h.in $(AM_SOURCES) $(include_HEADERS) $(noinst_
sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \ sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
-e "s,@GIT_REVISION\@,$${GIT_REVISION}," \ -e "s,@GIT_REVISION\@,$${GIT_REVISION}," \
-e "s|@GIT_BRANCH\@|$${GIT_BRANCH}|" \ -e "s|@GIT_BRANCH\@|$${GIT_BRANCH}|" \
-e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" \ -e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" $< > version_string.h; \
-e "s|@SWIFT_CPPFLAGS\@|$(CPPFLAGS)|" $< > version_string.h; \
else \ else \
if test ! -f version_string.h; then \ if test ! -f version_string.h; then \
sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \ sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
-e "s,@GIT_REVISION\@,unknown," \ -e "s,@GIT_REVISION\@,unknown," \
-e "s,@GIT_BRANCH\@,unknown," \ -e "s,@GIT_BRANCH\@,unknown," \
-e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" \ -e "s|@SWIFT_CFLAGS\@|$(CFLAGS)|" $< > version_string.h; \
-e "s|@SWIFT_CPPFLAGS\@|$(CPPLAGS)|" $< > version_string.h; \
fi; \ fi; \
fi fi
......
...@@ -375,7 +375,6 @@ void writeCodeDescription(hid_t h_file) { ...@@ -375,7 +375,6 @@ void writeCodeDescription(hid_t h_file) {
writeAttribute_s(h_grpcode, "Git Revision", git_revision()); writeAttribute_s(h_grpcode, "Git Revision", git_revision());
writeAttribute_s(h_grpcode, "Configuration options", configuration_options()); writeAttribute_s(h_grpcode, "Configuration options", configuration_options());
writeAttribute_s(h_grpcode, "CFLAGS", compilation_cflags()); writeAttribute_s(h_grpcode, "CFLAGS", compilation_cflags());
writeAttribute_s(h_grpcode, "CPPFLAGS", compilation_cppflags());
writeAttribute_s(h_grpcode, "HDF5 library version", hdf5_version()); writeAttribute_s(h_grpcode, "HDF5 library version", hdf5_version());
#ifdef HAVE_FFTW #ifdef HAVE_FFTW
writeAttribute_s(h_grpcode, "FFTW library version", fftw3_version()); writeAttribute_s(h_grpcode, "FFTW library version", fftw3_version());
......
...@@ -149,25 +149,6 @@ const char *compilation_cflags(void) { ...@@ -149,25 +149,6 @@ const char *compilation_cflags(void) {
return buf; 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 * @brief The version of SWIFT
* *
...@@ -356,7 +337,6 @@ void greetings(void) { ...@@ -356,7 +337,6 @@ void greetings(void) {
printf(" Config. options: %s\n\n", configuration_options()); printf(" Config. options: %s\n\n", configuration_options());
printf(" Compiler: %s, Version: %s\n", compiler_name(), compiler_version()); printf(" Compiler: %s, Version: %s\n", compiler_name(), compiler_version());
printf(" CFLAGS : %s\n", compilation_cflags()); printf(" CFLAGS : %s\n", compilation_cflags());
printf(" CPPFLAGS: %s\n", compilation_cppflags());
printf("\n"); printf("\n");
#ifdef HAVE_HDF5 #ifdef HAVE_HDF5
printf(" HDF5 library version: %s\n", hdf5_version()); printf(" HDF5 library version: %s\n", hdf5_version());
......
...@@ -27,7 +27,6 @@ const char* git_revision(void); ...@@ -27,7 +27,6 @@ const char* git_revision(void);
const char* git_branch(void); const char* git_branch(void);
const char* configuration_options(void); const char* configuration_options(void);
const char* compilation_cflags(void); const char* compilation_cflags(void);
const char* compilation_cppflags(void);
const char* compiler_name(void); const char* compiler_name(void);
const char* compiler_version(void); const char* compiler_version(void);
const char* mpi_version(void); const char* mpi_version(void);
......
...@@ -29,6 +29,5 @@ ...@@ -29,6 +29,5 @@
#define GIT_REVISION "@GIT_REVISION@" #define GIT_REVISION "@GIT_REVISION@"
#define GIT_BRANCH "@GIT_BRANCH@" #define GIT_BRANCH "@GIT_BRANCH@"
#define SWIFT_CFLAGS "@SWIFT_CFLAGS@" #define SWIFT_CFLAGS "@SWIFT_CFLAGS@"
#define SWIFT_CPPFLAGS "@SWIFT_CPPFLAGS@"
#endif /* SWIFT_VERSION_STRING_H */ #endif /* SWIFT_VERSION_STRING_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment