Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
SWIFT
SWIFTsim
Commits
4f43c44f
Commit
4f43c44f
authored
6 years ago
by
Loic Hausammann
Browse files
Options
Downloads
Patches
Plain Diff
Logger: python library compiled only with autotools
parent
1176b1a2
No related branches found
No related tags found
1 merge request
!685
Logger loader
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
logger/Makefile.am
+8
-7
8 additions, 7 deletions
logger/Makefile.am
with
9 additions
and
8 deletions
configure.ac
+
1
−
1
View file @
4f43c44f
...
@@ -1040,7 +1040,7 @@ if test "x$with_python" != "xno"; then
...
@@ -1040,7 +1040,7 @@ if test "x$with_python" != "xno"; then
fi
fi
AC_SUBST([PYTHON_LIBS])
AC_SUBST([PYTHON_LIBS])
AC_SUBST([PYTHON_INCS])
AC_SUBST([PYTHON_INCS])
AM_CONDITIONAL([HAVEPYTHON],[test -n "$PYTHON_
LIB
S"])
AM_CONDITIONAL([HAVEPYTHON],[test -n "$PYTHON_
INC
S"])
# Check for HDF5. This is required.
# Check for HDF5. This is required.
...
...
This diff is collapsed.
Click to expand it.
logger/Makefile.am
+
8
−
7
View file @
4f43c44f
...
@@ -16,16 +16,19 @@
...
@@ -16,16 +16,19 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Add the non-standard paths to the included library headers
# Add the non-standard paths to the included library headers
AM_CFLAGS
=
$(
PYTHON_INCS
)
AM_CFLAGS
=
$(
PYTHON_INCS
)
-I
$(
top_srcdir
)
/src
$(
HDF5_CPPFLAGS
)
$(
GSL_INCS
)
$(
FFTW_INCS
)
$(
GRACKLE_INCS
)
AM_LDFLAGS
=
$(
HDF5_LDFLAGS
)
# Assign a "safe" version number
# Assign a "safe" version number
AM
_LDFLAGS
=
-version-info
0:0:0
BIN
_LDFLAGS
=
-version-info
0:0:0
# The git command, if available.
# The git command, if available.
GIT_CMD
=
@GIT_CMD@
GIT_CMD
=
@GIT_CMD@
# Additional dependencies for shared libraries.
# Additional dependencies for shared libraries.
EXTRA_LIBS
=
$(
PROFILER_LIBS
)
$(
TCMALLOC_LIBS
)
$(
JEMALLOC_LIBS
)
$(
TBBMALLOC_LIBS
)
$(
PYTHON_LIBS
)
EXTRA_LIBS
=
$(
PROFILER_LIBS
)
$(
TCMALLOC_LIBS
)
$(
JEMALLOC_LIBS
)
$(
TBBMALLOC_LIBS
)
$(
PYTHON_LIBS
)
$(
HDF5_LIBS
)
$(
FFTW_LIBS
)
$(
GRACKLE_LIBS
)
$(
VELOCIRAPTOR_LIBS
)
$(
GSL_LIBS
)
# MPI libraries.
# MPI libraries.
# MPI_LIBS = $(MPI_THREAD_LIBS)
# MPI_LIBS = $(MPI_THREAD_LIBS)
...
@@ -42,19 +45,18 @@ lib_LTLIBRARIES = libswiftlogger.la
...
@@ -42,19 +45,18 @@ lib_LTLIBRARIES = libswiftlogger.la
include_HEADERS
=
header.h io.h particle.h timeline.h logger_tools.h
include_HEADERS
=
header.h io.h particle.h timeline.h logger_tools.h
# Common source files
# Common source files
AM_SOURCES
=
header.c io.c particle.c timeline.c
AM_SOURCES
=
header.c io.c particle.c timeline.c
logger_tools.c
if
HAVEPYTHON
if
HAVEPYTHON
AM_SOURCES
+=
logger_loader.c
AM_SOURCES
+=
logger_loader.c
endif
endif
# Include files for distribution, not installation.
# Include files for distribution, not installation.
nobase_noinst_HEADERS
=
nobase_noinst_HEADERS
=
# Sources and flags for regular library
# Sources and flags for regular library
libswiftlogger_la_SOURCES
=
$(
AM_SOURCES
)
libswiftlogger_la_SOURCES
=
$(
AM_SOURCES
)
libswiftlogger_la_CFLAGS
=
$(
AM_CFLAGS
)
libswiftlogger_la_CFLAGS
=
$(
AM_CFLAGS
)
libswiftlogger_la_LDFLAGS
=
$(
AM_LDFLAGS
)
$(
EXTRA_LIBS
)
libswiftlogger_la_LDFLAGS
=
$(
AM_LDFLAGS
)
$(
EXTRA_LIBS
)
$(
BIN_LDFLAGS
)
# Sources and flags for MPI library
# Sources and flags for MPI library
# libswiftlogger_mpi_la_SOURCES = $(AM_SOURCES)
# libswiftlogger_mpi_la_SOURCES = $(AM_SOURCES)
...
@@ -63,7 +65,6 @@ libswiftlogger_la_LDFLAGS = $(AM_LDFLAGS) $(EXTRA_LIBS)
...
@@ -63,7 +65,6 @@ libswiftlogger_la_LDFLAGS = $(AM_LDFLAGS) $(EXTRA_LIBS)
# libswiftlogger_mpi_la_SHORTNAME = mpi
# libswiftlogger_mpi_la_SHORTNAME = mpi
# libswiftlogger_mpi_la_LIBADD =
# libswiftlogger_mpi_la_LIBADD =
# Versioning. If any sources change then update the version_string.h file with
# Versioning. If any sources change then update the version_string.h file with
# the current git revision and package version.
# the current git revision and package version.
# May have a checkout without a version_string.h file and no git command (tar/zip
# May have a checkout without a version_string.h file and no git command (tar/zip
...
...
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