Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
solverstack
ScalFMM
Commits
60e671b3
Commit
60e671b3
authored
Apr 30, 2014
by
PIACIBELLO Cyrille
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git+ssh://scm.gforge.inria.fr//gitroot/scalfmm/scalfmm
parents
9c790338
dd99e8c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
CMakeLists.txt
CMakeLists.txt
+5
-1
Tests/CMakeLists.txt
Tests/CMakeLists.txt
+3
-2
No files found.
CMakeLists.txt
View file @
60e671b3
...
...
@@ -160,12 +160,15 @@ endif(ScalFMM_USE_BLAS)
if
(
ScalFMM_USE_FFT
)
OPTION
(
ScalFMM_USE_MKL_AS_FFTW
"Set to ON to use MKL FFTW"
ON
)
if
(
ScalFMM_USE_MKL_AS_FFTW
)
SET
(
FFT_LIBRARIES
"-I$ENV{MKLROOT}/include/fftw; -L$ENV{MKLROOT}/lib; -lmkl_intel_lp64; -lmkl_sequential; -lmkl_core; -lpthread; -lm"
CACHE STRING
"Set your MKL flags"
)
SET
(
FFT_LIBRARIES
"-L$ENV{MKLROOT}/lib; -lmkl_intel_lp64; -lmkl_sequential; -lmkl_core; -lpthread; -lm"
CACHE STRING
"Set your MKL flags"
)
SET
(
FFT_INCLUDES
"$ENV{MKLROOT}/include/fftw"
CACHE STRING
"Set your MKL flags"
)
else
()
SET
(
FFT_LIBRARIES
"-lfftw3"
CACHE STRING
"Use LIBFFTW"
)
endif
()
SET
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
FFT_LIBRARIES
}
"
)
SET
(
SCALFMM_INCLUDES
"
${
SCALFMM_INCLUDES
}
;
${
FFT_INCLUDES
}
"
)
MESSAGE
(
STATUS
"SCALFMM_LIBRARIES =
${
SCALFMM_LIBRARIES
}
"
)
MESSAGE
(
STATUS
"SCALFMM_INCLUDES =
${
SCALFMM_INCLUDES
}
"
)
endif
(
ScalFMM_USE_FFT
)
# Compile option
...
...
@@ -315,3 +318,4 @@ INCLUDE(CPack)
MESSAGE
(
STATUS
"CMAKE_CXX_FLAGS =
${
CMAKE_CXX_FLAGS
}
"
)
MESSAGE
(
STATUS
"ScaLFMM_CXX_FLAGS =
${
ScaLFMM_CXX_FLAGS
}
"
)
MESSAGE
(
STATUS
"SCALFMM_LIBRARIES =
${
SCALFMM_LIBRARIES
}
"
)
MESSAGE
(
STATUS
"SCALFMM_INCLUDES =
${
SCALFMM_INCLUDES
}
"
)
Tests/CMakeLists.txt
View file @
60e671b3
...
...
@@ -17,8 +17,9 @@ file(
# Adding the project sources dir as an include dir
INCLUDE_DIRECTORIES
(
${
CMAKE_BINARY_DIR
}
/Src
${
CMAKE_SOURCE_DIR
}
/Src
${
CMAKE_BINARY_DIR
}
/Src
${
CMAKE_SOURCE_DIR
}
/Src
${
SCALFMM_INCLUDES
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment