Merge pull request #1003 from arcaneframework/dev/gg-move-sloop-in-common-arcane-part

Move 'aleph/sloop' to 'src/arcane/aleph'

Author: grospelliergilles

arcane/ceapart/CMakeLists.txt

@@ -12,27 +12,12 @@ message(STATUS "ARCANEBUILDROOT for CEA = ${ARCANEBUILDROOT}")
 file(MAKE_DIRECTORY ${ARCANEBUILDROOT}/share)
 file(MAKE_DIRECTORY ${ARCANEBUILDROOT}/share/axl)
 
-# A supprimer mais en attendant permet de compiler avec IntelMPI
-if (ARCANE_WANT_MPI_DISTRIB MATCHES "intelmpi")
-  set(DISABLE_SLOOP_AND_TRILINOS YES)
-  include(cmake/FindItac.cmake)
-endif ()
-if(ARCANE_USE_MPC)
-  set(DISABLE_SLOOP_AND_TRILINOS YES)
-endif()
-
 # ----------------------------------------------------------------------------
 
 include(cmake/VT100.cmake)
 if(NOT WIN32)
-  # Lima a besoin de LM et F90 donc il faut qu'ils soient
-  # recherchés avan lui
   include(cmake/FindItac.cmake)
   include(cmake/FindMathlink.cmake)
-
-  if(NOT DISABLE_SLOOP_AND_TRILINOS)
-    include(cmake/FindSuperLU.cmake)
-  endif()
 endif()
 
 if(NOT WIN32 AND MATHLINK_FOUND)
@@ -43,7 +28,6 @@ add_subdirectory(src/arcane/cea)
 add_subdirectory(src/arcane/geometric)
 add_subdirectory(src/arcane/meshutils)
 add_subdirectory(src/arcane/hyoda)
-add_subdirectory(src/arcane/aleph/sloop)
 
 # ----------------------------------------------------------------------------
 # Ajoute des tests.

arcane/src/arcane/aleph/CMakeLists.txt

@@ -1,4 +1,4 @@
-include(srcs.cmake)
+include(srcs.cmake)
 
 arcane_add_library(arcane_aleph
   INPUT_PATH ${Arcane_SOURCE_DIR}/src
@@ -21,3 +21,26 @@ if(MPI_FOUND)
   endif()
   add_subdirectory(tests)
 endif()
+
+# A supprimer mais en attendant permet de compiler Sloop avec IntelMPI
+if (ARCANE_WANT_MPI_DISTRIB MATCHES "intelmpi")
+  set(DISABLE_SLOOP_AND_TRILINOS YES)
+  include(cmake/FindItac.cmake)
+endif ()
+if(ARCANE_USE_MPC)
+  set(DISABLE_SLOOP_AND_TRILINOS YES)
+endif()
+
+if(NOT WIN32)
+  if(NOT DISABLE_SLOOP_AND_TRILINOS)
+    include(${CMAKE_CURRENT_LIST_DIR}/FindSuperLU.cmake)
+    add_subdirectory(sloop)
+  endif()
+endif()
+
+# ----------------------------------------------------------------------------
+# Local Variables:
+# tab-width: 2
+# indent-tabs-mode: nil
+# coding: utf-8-with-signature
+# End:

arcane/ceapart/cmake/FindSuperLU.cmake renamed to arcane/src/arcane/aleph/FindSuperLU.cmake

@@ -1,16 +1,16 @@
-info("${VT100_FG_GREEN}Looking for ${VT100_BOLD}SuperLU${VT100_RESET}")
+message(STATUS "Looking for SuperLU")
 
 find_path(SUPERLU_INCLUDE_DIRS superlu_defs.h)
 find_library(SUPERLU_LIBRARIES superlu_dist_4.2)
 
-info("${VT100_FG_GREEN}SUPERLU_LIBRARY=${VT100_BOLD}${SUPERLU_LIBRARY}${VT100_RESET}")
+message(STATUS "SUPERLU_LIBRARY=${SUPERLU_LIBRARY}")
 
 MESSAGE(STATUS "SUPERLU_LIBRARIES = ${SUPERLU_LIBRARIES}")
 MESSAGE(STATUS "SUPERLU_INCLUDE_DIRS = ${SUPERLU_INCLUDE_DIRS}")
 
 set(SUPERLU_FOUND "NO")
 if(SUPERLU_INCLUDE_DIRS AND SUPERLU_LIBRARIES)
   set(SUPERLU_FOUND "YES" )
-  info("${VT100_FG_GREEN}${VT100_BOLD}SUPERU_FOUND=YES${VT100_RESET}")
+  message(STATUS "SUPERU_FOUND=YES")
   arcane_add_package_library(superlu SUPERLU)
 endif()