Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
d43f61a0
Commit
d43f61a0
authored
Jun 11, 2013
by
aetcheve
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modif cmake install
parent
0f451d65
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
11 deletions
+13
-11
CMakeLists.txt
CMakeLists.txt
+3
-3
ScalFMMConfig.cmake.in
ScalFMMConfig.cmake.in
+3
-3
Src/CMakeLists.txt
Src/CMakeLists.txt
+3
-2
Src/Components/FBasicParticleContainer.hpp
Src/Components/FBasicParticleContainer.hpp
+4
-3
No files found.
CMakeLists.txt
View file @
d43f61a0
...
...
@@ -36,7 +36,7 @@ MESSAGE(STATUS " CXX ${CMAKE_CXX_COMPILER_ID}" )
# Options
OPTION
(
SCALFMM_USE_MPI
"Set to ON to build ScaFMM with MPI"
OFF
)
OPTION
(
SCALFMM_USE_BLAS
"Set to ON to build ScaFMM with BLAS"
O
N
)
OPTION
(
SCALFMM_USE_BLAS
"Set to ON to build ScaFMM with BLAS"
O
FF
)
OPTION
(
SCALFMM_USE_TRACE
"Set to ON to print trace or use itac trace"
OFF
)
OPTION
(
SCALFMM_BUILD_TESTS
"Set to ON to build fonctionnalities Tests"
OFF
)
OPTION
(
SCALFMM_BUILD_UTESTS
"Set to ON to build UTests"
OFF
)
...
...
@@ -97,8 +97,8 @@ if( SCALFMM_USE_BLAS )
elseif
(
SCALFMM_USE_EXTERNAL_BLAS
)
MESSAGE
(
STATUS
"BLAS SET BY EXTERNAL PROGRAM =
${
BLAS_LIBRARIES
}
"
)
else
()
INCLUDE
(
FindBLAS
)
INCLUDE
(
FindLAPACK
)
#
INCLUDE(FindBLAS)
#
INCLUDE(FindLAPACK)
endif
()
#SET(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES} ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}")
SET
(
SCALFMM_LIBRARIES
${
SCALFMM_LIBRARIES
}
${
BLAS_LIBRARIES
}
${
LAPACK_LIBRARIES
}
)
...
...
ScalFMMConfig.cmake.in
View file @
d43f61a0
...
...
@@ -33,8 +33,8 @@ SET(ScalFMM_USE_MEM_STATS "@SCALFMM_USE_MEM_STATS@")
#
#
#
SET(ScalFMM_LIBRARIES
"-L${ScalFMM_LIBRARIES_DIR} -l${ScalFMM_LIBRARY_NAME} ${ScalFMM_LIBRARIES_ADD}"
)
SET(ScalFMM_INCLUDE_DIRS
"
${ScalFMM_INCLUDE_DIR}
SET(ScalFMM_LIBRARIES
-L${ScalFMM_LIBRARIES_DIR} -l${ScalFMM_LIBRARY_NAME} ${ScalFMM_LIBRARIES_ADD}
)
SET(ScalFMM_INCLUDE_DIRS ${ScalFMM_INCLUDE_DIR}
${ScalFMM_INCLUDE_DIR}/Utils
${ScalFMM_INCLUDE_DIR}/Components
${ScalFMM_INCLUDE_DIR}/Arranger
...
...
@@ -43,7 +43,7 @@ SET(ScalFMM_INCLUDE_DIRS "${ScalFMM_INCLUDE_DIR}
${ScalFMM_INCLUDE_DIR}/Extensions
${ScalFMM_INCLUDE_DIR}/Files
${ScalFMM_INCLUDE_DIR}/Kernels
${ScalFMM_INCLUDE_DIR}/Chebyshev
"
)
${ScalFMM_INCLUDE_DIR}/Chebyshev)
#SCALFMM_BUILD_TESTS => OFF
#SCALFMM_BUILD_UTESTS => OFF
\ No newline at end of file
Src/CMakeLists.txt
View file @
d43f61a0
...
...
@@ -42,8 +42,9 @@ install( TARGETS scalfmm ARCHIVE DESTINATION lib )
# Install header
SET
(
my_include_dirs
"."
"Arranger"
"Core"
"Utils"
"Chebyshev"
"Components"
"Extensions"
"Containers"
"Files"
"Kernels/Spherical"
)
"Kernels/Chebyshev"
"Components"
"Extensions"
"Containers"
"Files"
"Kernels/Spherical"
"Kernels/P2P"
"Kernels/Taylor"
"Kernels/ROtation"
)
FOREACH
(
my_dir
${
my_include_dirs
}
)
file
(
GLOB
...
...
Src/Components/FBasicParticleContainer.hpp
View file @
d43f61a0
...
...
@@ -17,7 +17,8 @@
#define FBASICPARTICLECONTAINER_HPP
#include "FAbstractParticleContainer.hpp"
#include "FMath.hpp"
#include "FPoint.hpp"
#include <type_traits>
/**
...
...
@@ -104,7 +105,7 @@ public:
* @brief getPositions
* @return a FReal*[3] to get access to the positions
*/
const
FReal
*
const
*
const
getPositions
()
const
{
const
FReal
*
getPositions
()
const
{
return
positions
;
}
...
...
@@ -112,7 +113,7 @@ public:
* @brief getWPositions
* @return get the position in write mode
*/
FReal
*
const
*
const
getWPositions
()
{
FReal
*
const
*
getWPositions
()
{
return
positions
;
}
...
...
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