Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
libcdi
Commits
f613bd71
Commit
f613bd71
authored
3 years ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
Avoid building Fortran programs with CPPFLAGS.
parent
b98a7e09
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!34
Version 2.2.0
,
!13
Consolidation with CDI-PIO (develop)
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
examples/pio/Makefile.am
+3
-6
3 additions, 6 deletions
examples/pio/Makefile.am
tests/Makefile.am
+1
-4
1 addition, 4 deletions
tests/Makefile.am
with
4 additions
and
10 deletions
examples/pio/Makefile.am
+
3
−
6
View file @
f613bd71
...
...
@@ -16,9 +16,9 @@ AM_CPPFLAGS += -DUSE_MPI
endif
ENABLE_MPI
AM_CFLAGS
=
$(
MPI_C_INCLUDE
)
AM_FCFLAGS
=
$(
FC_OPTINC
)$(
top_srcdir
)
/src
$(
MPI_FC_INCLUDE
)
AM_FCFLAGS
=
$(
FC_OPTINC
)$(
top_builddir
)
/src
$(
FC_OPTINC
)$(
top_srcdir
)
/src
$(
MPI_FC_INCLUDE
)
if
ENABLE_MPI
AM_FCFLAGS
+=
$(
FC_DEFINE
)
USE_MPI
AM_FCFLAGS
+=
$(
FC_DEFINE
)
USE_MPI
$(
YAXT_FC_MOD
)
endif
ENABLE_MPI
AM_LDFLAGS
=
...
...
@@ -57,7 +57,4 @@ CXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(
LIBTOOLFLAGS
)
--mode
=
compile
$(
CXX
)
-static
$(
DEFS
)
\
$(
DEFAULT_INCLUDES
)
$(
INCLUDES
)
$(
AM_CPPFLAGS
)
$(
CPPFLAGS
)
\
$(
AM_CXXFLAGS
)
$(
CXXFLAGS
)
PPFCCOMPILE
=
$(
LIBTOOL
)
$(
AM_V_lt
)
--tag
=
FC
$(
AM_LIBTOOLFLAGS
)
\
$(
LIBTOOLFLAGS
)
--mode
=
compile
$(
FC
)
-static
$(
DEFS
)
\
$(
DEFAULT_INCLUDES
)
$(
INCLUDES
)
$(
AM_CPPFLAGS
)
$(
CPPFLAGS
)
\
$(
AM_FCFLAGS
)
$(
FCFLAGS
)
PPFCCOMPILE
=
$(
FCCOMPILE
)
This diff is collapsed.
Click to expand it.
tests/Makefile.am
+
1
−
4
View file @
f613bd71
...
...
@@ -152,7 +152,4 @@ CXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(
LIBTOOLFLAGS
)
--mode
=
compile
$(
CXX
)
-static
$(
DEFS
)
\
$(
DEFAULT_INCLUDES
)
$(
INCLUDES
)
$(
AM_CPPFLAGS
)
$(
CPPFLAGS
)
\
$(
AM_CXXFLAGS
)
$(
CXXFLAGS
)
PPFCCOMPILE
=
$(
LIBTOOL
)
$(
AM_V_lt
)
--tag
=
FC
$(
AM_LIBTOOLFLAGS
)
\
$(
LIBTOOLFLAGS
)
--mode
=
compile
$(
FC
)
-static
$(
DEFS
)
\
$(
DEFAULT_INCLUDES
)
$(
INCLUDES
)
$(
AM_CPPFLAGS
)
$(
CPPFLAGS
)
\
$(
AM_FCFLAGS
)
$(
FCFLAGS
)
PPFCCOMPILE
=
$(
FCCOMPILE
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment