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
a6940e63
Commit
a6940e63
authored
5 years ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
Account for static-only build.
parent
2d92e247
No related branches found
Branches containing commit
No related tags found
1 merge request
!7
Replaced gridDefDatatype()/gridInqDatatype() by cdiDefKeyInt()/cdiInqKeyInt()...
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure.ac
+7
-0
7 additions, 0 deletions
configure.ac
examples/pio/Makefile.am
+2
-2
2 additions, 2 deletions
examples/pio/Makefile.am
src/pkgconfig/cdipio.pc.in
+2
-2
2 additions, 2 deletions
src/pkgconfig/cdipio.pc.in
tests/Makefile.am
+2
-2
2 additions, 2 deletions
tests/Makefile.am
with
13 additions
and
6 deletions
configure.ac
+
7
−
0
View file @
a6940e63
...
...
@@ -246,6 +246,13 @@ AM_CONDITIONAL([USE_PPM_CORE],[test $enable_ppm = yes])
AM_CONDITIONAL([HAVE_PARALLEL_NC4],[test $HAVE_PARALLEL_NC4 -gt 0])
AC_SUBST([USE_MPI])
AC_SUBST([ENABLE_MPI],[`test x"$enable_mpi" = xyes && echo true || echo false`])
AC_SUBST([LIBRT])
AM_COND_IF([USE_MPI],
[LIBRT=
LIBS_save=$LIBS
AC_SEARCH_LIBS([aio_suspend], [rt],
[test "$ac_res" = "none required" || LIBRT=$ac_res])
LIBS=$LIBS_save])
# ----------------------------------------------------------------------
# Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
#
...
...
This diff is collapsed.
Click to expand it.
examples/pio/Makefile.am
+
2
−
2
View file @
a6940e63
...
...
@@ -16,8 +16,8 @@ endif
collectData_SOURCES
=
collectData.c
if
USE_MPI
LDADD
=
$(
top_builddir
)
/src/libcdipio.la
$(
MPI_C_LIB
)
collectData2003_LDADD
=
$(
top_builddir
)
/src/libcdipio.la
$(
MPI_FC_LIB
)
LDADD
=
$(
top_builddir
)
/src/libcdipio.la
$(
LIBRT
)
$(
MPI_C_LIB
)
collectData2003_LDADD
=
$(
top_builddir
)
/src/libcdipio.la
$(
LIBRT
)
$(
MPI_FC_LIB
)
else
LDADD
=
$(
top_builddir
)
/src/libcdi.la
collectData2003_LDADD
=
$(
top_builddir
)
/src/libcdi.la
...
...
This diff is collapsed.
Click to expand it.
src/pkgconfig/cdipio.pc.in
+
2
−
2
View file @
a6940e63
...
...
@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
cflags=-I@includedir@
fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@
libs=-L@libdir@ -lcdipio @PPM_CORE_LIBS@ @YAXT_LIBS@ -lcdi @GRIB_API_LIBS@ @NETCDF_LIBS@ @SZLIB_LIBS@ @THREADS_LIBS@ @LIBS@
libs=-L@libdir@ -lcdipio
@LIBRT@
@PPM_CORE_LIBS@ @YAXT_LIBS@ -lcdi @GRIB_API_LIBS@ @NETCDF_LIBS@ @SZLIB_LIBS@ @THREADS_LIBS@ @LIBS@
threads_libs=@THREADS_LIBS@
threads_cflags=@THREADS_INCLUDE@
szlib_cflags=@SZLIB_INCLUDE@
...
...
@@ -14,7 +14,7 @@ netcdf_cflags=@NETCDF_INCLUDE@
netcdf_libs=@NETCDF_LIBS@
grib_api_cflags=@GRIB_API_INCLUDE@
grib_api_libs=@GRIB_API_LIBS@
aux_libs=@LIBS@
aux_libs=
@LIBRT@
@LIBS@
cdipio_build_cc=@CC@
cdipio_build_cflags=@CFLAGS@
cdipio_build_cppflags=@CPPFLAGS@
...
...
This diff is collapsed.
Click to expand it.
tests/Makefile.am
+
2
−
2
View file @
a6940e63
...
...
@@ -47,8 +47,8 @@ test_byteswap_SOURCES = test_byteswap.c
#
AM_CFLAGS
=
$(
PPM_CORE_CFLAGS
)
$(
YAXT_CFLAGS
)
$(
MPI_C_INCLUDE
)
if
USE_MPI
pio_write_LDADD
=
../src/libcdipio.la
$(
MPI_C_LIB
)
pio_write_deco2d_LDADD
=
../src/libcdipio.la
$(
MPI_C_LIB
)
pio_write_LDADD
=
../src/libcdipio.la
$(
LIBRT
)
$(
MPI_C_LIB
)
pio_write_deco2d_LDADD
=
../src/libcdipio.la
$(
LIBRT
)
$(
MPI_C_LIB
)
TESTS
+=
test_resource_copy_mpi_run
check_PROGRAMS
+=
test_resource_copy_mpi
test_resource_copy_mpi_LDADD
=
../src/libcdipio.la
...
...
This diff is collapsed.
Click to expand it.
Sergey Kosukhin
@m300488
mentioned in commit
ca5cff44
·
3 years ago
mentioned in commit
ca5cff44
mentioned in commit ca5cff44a0c06f68b1ee5fdac340cd3d6f757272
Toggle commit list
Sergey Kosukhin
@m300488
mentioned in commit
1490dde4
·
3 years ago
mentioned in commit
1490dde4
mentioned in commit 1490dde4487d686b30d72efd4518ae3582853f6e
Toggle commit list
Sergey Kosukhin
@m300488
mentioned in commit
4e2c8aac
·
3 years ago
mentioned in commit
4e2c8aac
mentioned in commit 4e2c8aac8d02bb9e2c80f22ae944df3e105be16c
Toggle commit list
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