Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//scalfmm/scalfmm

CMakeLists.txt

@@ -97,13 +97,15 @@ if( SCALFMM_USE_BLAS )
 	INCLUDE(FindBLAS)
 	INCLUDE(FindLAPACK)
   endif()
-SET(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES} ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}")
+  #SET(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES} ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}")
+  SET(SCALFMM_LIBRARIES ${SCALFMM_LIBRARIES} ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
+  #MESSAGE(${SCALFMM_LIBRARIES})
 endif()
 
 # Compile option
 ADD_DEFINITIONS(-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wconversion)
 
-CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake 
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake 
 		${CMAKE_BINARY_DIR}/Src/ScalFmmConfig.h  )
 
 # Use Mem stats

Src/Utils/FGlobalPeriodic.hpp

@@ -37,7 +37,7 @@ enum PeriodicCondition {
     AllDirs     = (DirX | DirY | DirZ)
 };
 
-bool TestPeriodicCondition(const int conditions, const PeriodicCondition testConditions) {
+inline bool TestPeriodicCondition(const int conditions, const PeriodicCondition testConditions) {
     return (conditions & testConditions) == testConditions;
 }