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
48c4f03f
Commit
48c4f03f
authored
7 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Propagate the non-standard installation path of FFTW to the Makefiles.
parent
4cd882ab
No related branches found
No related tags found
1 merge request
!534
Allow the user to specify a non-standard path for the FFTW library at configure time.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
examples/Makefile.am
+2
-2
2 additions, 2 deletions
examples/Makefile.am
src/Makefile.am
+2
-2
2 additions, 2 deletions
src/Makefile.am
tests/Makefile.am
+2
-2
2 additions, 2 deletions
tests/Makefile.am
with
6 additions
and
6 deletions
examples/Makefile.am
+
2
−
2
View file @
48c4f03f
...
...
@@ -18,8 +18,8 @@
# Common flags
MYFLAGS
=
# Add the source directory and
debug
to CFLAGS
AM_CFLAGS
=
-I
$(
top_srcdir
)
/src
$(
HDF5_CPPFLAGS
)
$(
GSL_INCS
)
# Add the source directory and
the non-standard paths to the included library headers
to CFLAGS
AM_CFLAGS
=
-I
$(
top_srcdir
)
/src
$(
HDF5_CPPFLAGS
)
$(
GSL_INCS
)
$(
FFTW_INCS
)
AM_LDFLAGS
=
$(
HDF5_LDFLAGS
)
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
2
−
2
View file @
48c4f03f
...
...
@@ -15,8 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Add the
debug flag to the whole thing
AM_CFLAGS
=
$(
HDF5_CPPFLAGS
)
$(
GSL_INCS
)
# Add the
non-standard paths to the included library headers
AM_CFLAGS
=
$(
HDF5_CPPFLAGS
)
$(
GSL_INCS
)
$(
FFTW_INCS
)
# Assign a "safe" version number
AM_LDFLAGS
=
$(
HDF5_LDFLAGS
)
$(
FFTW_LIBS
)
-version-info
0:0:0
...
...
This diff is collapsed.
Click to expand it.
tests/Makefile.am
+
2
−
2
View file @
48c4f03f
...
...
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Add the source directory and
debug
to CFLAGS
AM_CFLAGS
=
-I
$(
top_srcdir
)
/src
$(
HDF5_CPPFLAGS
)
$(
GSL_INCS
)
# Add the source directory and
the non-standard paths to the included library headers
to CFLAGS
AM_CFLAGS
=
-I
$(
top_srcdir
)
/src
$(
HDF5_CPPFLAGS
)
$(
GSL_INCS
)
$(
FFTW_INCS
)
AM_LDFLAGS
=
../src/.libs/libswiftsim.a
$(
HDF5_LDFLAGS
)
$(
HDF5_LIBS
)
$(
FFTW_LIBS
)
$(
GRACKLE_LIBS
)
$(
GSL_LIBS
)
...
...
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