Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
f1788d3d
Commit
f1788d3d
authored
Nov 28, 2016
by
Matthieu Schaller
Browse files
Record CPPFLAGS (for
@jwillis
) and not CXXFLAGS.
parent
5825c624
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/Makefile.am
View file @
f1788d3d
...
...
@@ -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_C
XX
FLAGS
\@
|
$(C
XX
FLAGS)
|"
$<
>
version_string.h
;
\
-e
"s|@SWIFT_C
PP
FLAGS
\@
|
$(C
PP
FLAGS)
|"
$<
>
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_C
XX
FLAGS
\@
|
$(C
XXF
LAGS)
|"
$<
>
version_string.h
;
\
-e
"s|@SWIFT_C
PP
FLAGS
\@
|
$(C
PP
LAGS)
|"
$<
>
version_string.h
;
\
fi
;
\
fi
...
...
src/common_io.c
View file @
f1788d3d
...
...
@@ -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
,
"C
XX
FLAGS"
,
compilation_c
xx
flags
());
writeAttribute_s
(
h_grpcode
,
"C
PP
FLAGS"
,
compilation_c
pp
flags
());
writeAttribute_s
(
h_grpcode
,
"HDF5 library version"
,
hdf5_version
());
#ifdef HAVE_FFTW
writeAttribute_s
(
h_grpcode
,
"FFTW library version"
,
fftw3_version
());
...
...
src/version.c
View file @
f1788d3d
...
...
@@ -154,10 +154,10 @@ const char *compilation_cflags(void) {
*
* @result List of CPPFLAGS within simple quotes (')
*/
const
char
*
compilation_c
xx
flags
(
void
)
{
const
char
*
compilation_c
pp
flags
(
void
)
{
static
char
buf
[
1024
];
static
int
initialised
=
0
;
static
const
char
*
cppflags
=
SWIFT_C
XX
FLAGS
;
static
const
char
*
cppflags
=
SWIFT_C
PP
FLAGS
;
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
(
" C
XX
FLAGS: %s
\n
"
,
compilation_c
xx
flags
());
printf
(
" C
PP
FLAGS: %s
\n
"
,
compilation_c
pp
flags
());
printf
(
"
\n
"
);
#ifdef HAVE_HDF5
printf
(
" HDF5 library version: %s
\n
"
,
hdf5_version
());
...
...
src/version.h
View file @
f1788d3d
...
...
@@ -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_c
xx
flags
(
void
);
const
char
*
compilation_c
pp
flags
(
void
);
const
char
*
compiler_name
(
void
);
const
char
*
compiler_version
(
void
);
const
char
*
mpi_version
(
void
);
...
...
src/version_string.h.in
View file @
f1788d3d
...
...
@@ -29,6 +29,6 @@
#define GIT_REVISION "@GIT_REVISION@"
#define GIT_BRANCH "@GIT_BRANCH@"
#define SWIFT_CFLAGS "@SWIFT_CFLAGS@"
#define SWIFT_C
XX
FLAGS "@SWIFT_C
XX
FLAGS@"
#define SWIFT_C
PP
FLAGS "@SWIFT_C
PP
FLAGS@"
#endif /* SWIFT_VERSION_STRING_H */
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment