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
0aab175b
Commit
0aab175b
authored
5 years ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
Re-generate F2003 interface only in maintainer mode.
parent
0f110582
No related branches found
Branches containing commit
No related tags found
1 merge request
!7
Replaced gridDefDatatype()/gridInqDatatype() by cdiDefKeyInt()/cdiInqKeyInt()...
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+7
-7
7 additions, 7 deletions
configure.ac
src/Makefile.am
+2
-2
2 additions, 2 deletions
src/Makefile.am
with
9 additions
and
9 deletions
configure.ac
+
7
−
7
View file @
0aab175b
...
...
@@ -271,9 +271,6 @@ AM_COND_IF([USE_MPI],
# ----------------------------------------------------------------------
# Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
#
# the test for ruby itself is unconditional because ruby is also used in
# the Fortran 2003 ISO C generator
AC_CHECK_PROG([RUBY],[ruby],[ruby])
AC_ARG_ENABLE([iso-c-interface],
[AS_HELP_STRING([--enable-iso-c-interface],
[Create Fortran Interface via iso_c_bindings facility of F2003 [default=no].])],
...
...
@@ -312,12 +309,11 @@ AM_CONDITIONAL(ENABLE_SWIG,[test "x$SWIG" != "x"])
#
AC_ARG_ENABLE([ruby],
[AS_HELP_STRING([--enable-ruby],[ruby language bindings [default=no] (EXPERIMENTAL)])],
[RUBY_INCLUDES="$($RUBY $srcdir/config/interface.rb)"
[AC_CHECK_PROG([RUBY],[ruby],[ruby])
RUBY_INCLUDES="$($RUBY $srcdir/config/interface.rb)"
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
AC_CHECK_HEADER([ruby.h],,[enable_ruby=no
RUBY=
], [AC_INCLUDES_DEFAULT])
AC_CHECK_HEADER([ruby.h],,[enable_ruby=no], [AC_INCLUDES_DEFAULT])
CPPFLAGS=$save_CPPFLAGS
AS_IF([test "x$RUBY" != "x"],
[AS_IF([test "x$SWIG" = "x"],
...
...
@@ -329,6 +325,10 @@ AC_ARG_ENABLE([ruby],
[enable_ruby=no])
AM_CONDITIONAL(ENABLE_RUBY,[test "x$enable_ruby" != "xno"])
AS_IF([test "x$enable_ruby" != "xno"],[AC_SUBST([ENABLE_RUBY],[true])],[AC_SUBST([ENABLE_RUBY],[false])])
# Ruby is also used for the Fortran 2003 ISO C generator in maintainer mode.
# Report properly if it's missing:
AS_VAR_IF([RUBY], [], [AS_UNSET([RUBY])])
AM_MISSING_PROG([RUBY], [ruby])
# ----------------------------------------------------------------------
# Create the Python Interface via swig
AC_ARG_ENABLE(python,
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
2
−
2
View file @
0aab175b
...
...
@@ -270,8 +270,8 @@ endif
endif
#
mo_cdi.f90
:
$(top_srcdir)/src/cdi.h $(top_srcdir)/interfaces/f2003/bindGen.rb
$(
RUBY
)
$(
top_srcdir
)
/interfaces/f2003/bindGen.rb
$(
top_srcdir
)
/src/cdi.h
$@
mo_cdi.f90
:
@MAINTAINER_MODE_TRUE@
$(top_srcdir)/src/cdi.h $(top_srcdir)/interfaces/f2003/bindGen.rb
$(
AM_V_GEN
)
$(
RUBY
)
$(
top_srcdir
)
/interfaces/f2003/bindGen.rb
$(
top_srcdir
)
/src/cdi.h
$@
if
FORTRAN_MOD_UC
MO_CDI.$(FCMODEXT)
:
mo_cdi.lo
...
...
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