Commit d43f61a0 authored by aetcheve's avatar aetcheve

modif cmake install

parent 0f451d65
......@@ -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" ON )
OPTION( SCALFMM_USE_BLAS "Set to ON to build ScaFMM with BLAS" OFF )
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})
......
......@@ -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
......@@ -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
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment