Now we use mosrse_cmake submodule for blas, lapack and FFT. Works on Linux and...

Now we use mosrse_cmake submodule for blas, lapack and FFT. Works on Linux and MacOS with both Intel and gcc+mkl

CMakeLists.txt

@@ -44,17 +44,16 @@ SET(CMAKE_CXX_STANDARD 14)
 
 set( MORSE_DISTRIB_DIR "" CACHE PATH "Directory of MORSE distribution")
 
-if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/")
+if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_cmake")
 
   # Add extra cmake module path and initialize morse cmake modules
   # --------------------------------------------------------------
   if(MORSE_DISTRIB_DIR)
-    list(APPEND CMAKE_MODULE_PATH ${MORSE_DISTRIB_DIR}/cmake_modules)
-    list(APPEND CMAKE_MODULE_PATH "${MORSE_DISTRIB_DIR}/cmake_modules/morse")
-    set(MORSE_CMAKE_MODULE_PATH ${MORSE_DISTRIB_DIR}/cmake_modules/morse )
-  elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/")
-    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/)
-    set(MORSE_CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse )
+    list(APPEND CMAKE_MODULE_PATH ${MORSE_DISTRIB_DIR}/modules)
+    set(MORSE_CMAKE_MODULE_PATH ${MORSE_DISTRIB_DIR}/modules )
+  elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_cmake")
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_cmake/modules)
+    set(MORSE_CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_cmake/modules )
   endif()
   include(MorseInit)
   # Set the RPATH config
@@ -351,15 +350,15 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
     if( SCALFMM_USE_MKL_AS_BLAS )
       set(BLA_VENDOR "Intel10_64lp_seq")
       set(SCALFMM_BLAS_ADD_ ON)
-      find_package(BLASEXT QUIET) # not REQUIRED
+      find_package(BLAS ) # not REQUIRED
       unset(LAPACK_LIBRARIES)
       if (BLAS_LIBRARIES)
         set(BLASLAPACK_LIBRARIES ${BLAS_LIBRARIES})
       endif()
     elseif(SCALFMM_USE_ESSL_AS_BLAS)
       set(BLA_VENDOR "IBMESSL")
-      find_package(BLASEXT   QUIET) # not REQUIRED
-      find_package(LAPACKEXT QUIET) # not REQUIRED
+      find_package(BLAS   QUIET) # not REQUIRED
+      find_package(LAPACK QUIET) # not REQUIRED
       if (LAPACK_LIBRARIES)
         set(BLASLAPACK_LIBRARIES "${LAPACK_LIBRARIES}")
       endif()
@@ -370,8 +369,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
       message(STATUS "BLAS SET BY EXTERNAL PROGRAM = ${BLAS_LIBRARIES}")
       list(APPEND BLASLAPACK_LIBRARIES "${BLAS_LIBRARIES}")
     else()
-      find_package(BLASEXT)  # not REQUIRED
-      find_package(LAPACKEXT)  # not REQUIRED
+      find_package(BLAS)  # not REQUIRED
+      find_package(LAPACK)  # not REQUIRED
       set(BLASLAPACK_LIBRARIES)
       if (LAPACK_LIBRARIES)
         set(BLASLAPACK_LIBRARIES "${LAPACK_LIBRARIES}")
@@ -440,7 +439,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
         endif()
       endif (NOT SCALFMM_BLAS_ADD_ AND NOT SCALFMM_BLAS_UPCASE AND NOT SCALFMM_BLAS_NOCHANGE)
     else()
-      
+      MESSAGE(WARNING "BLAS: ${BLAS-FOUND}") 
+
       message(WARNING "BLAS has not been found, SCALFMM will continue to compile but some applications will be disabled.")
       message(WARNING "If you have BLAS set BLAS_LIBDIR, BLAS_INCDIR or BLAS_DIR (CMake variables using -D or environment variables).")
       if( NOT SCALFMM_USE_MKL_AS_FFTW )
@@ -985,7 +985,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
   #                               END                              #
   ##################################################################
   #
-else(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/")
+else(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_cmake")
 
   message(STATUS "MORSE_DISTRIB_DIR is not set")
   message(STATUS "Please indicate where is located your MORSE distribution directory."
@@ -993,4 +993,4 @@ else(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse
   message(STATUS "If you are a MORSE developer, you normally have access to the svn repository of the MORSE_DISTRIB_DIR: "
     "svn checkout svn+ssh://yourlogin@scm.gforge.inria.fr/svnroot/morse/trunk/morse_distrib")
 
-endif(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/")
+endif(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_cmake")

README.md

@@ -28,7 +28,12 @@ The following are optional:
   - Custom BLAS, FFT implementations.
   - [StarPU](http://starpu.gforge.inria.fr/) for the relevant FMM implementations.
 
-### Build
+### To get and Build ScalFMM
+
+To obtain ScalFMM (develop branch) and its git submodules do
+``` bash
+git clone --recursive git@gitlab.inria.fr:solverstack/ScalFMM.git -b develop
+```
 
 ``` bash
 # Move to the build folder