Commit c5f970da authored by Berenger Bramas's avatar Berenger Bramas

Update CMAKE such that FUSE contains all the KEYS that should be tested to...

Update CMAKE such that FUSE contains all the KEYS that should be tested to active/disable some binary, no matter if KEYS are themself use or not
parent 0de43401
......@@ -328,11 +328,9 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
"by setting MPI_DIR cmake variable.")
endif (MPI_CXX_FOUND)
else(MPI_FOUND)
list(APPEND FUSE_LIST "MPI")
endif(MPI_FOUND)
else()
list(APPEND FUSE_LIST "MPI")
endif( SCALFMM_USE_MPI)
list(APPEND FUSE_LIST "MPI")
#
##############################################################################
# Blas option #
......@@ -450,10 +448,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
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).")
set(SCALFMM_USE_BLAS OFF)
list(APPEND FUSE_LIST "BLAS")
endif()
endif(SCALFMM_USE_BLAS)
list(APPEND FUSE_LIST "BLAS")
#
# FFT option
#
......@@ -504,7 +502,6 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
message(WARNING "FFTW has not been found, SCALFMM will continue to compile but some applications will be disabled.")
message(WARNING "If you have FFTW set FFTW_LIBDIR, FFTW_INCDIR or FFTW_DIR (CMake variables using -D or environment variables).")
set(SCALFMM_USE_FFT OFF)
list(APPEND FUSE_LIST "FFT")
endif(FFTW_FOUND)
endif(SCALFMM_USE_FFT)
......@@ -515,6 +512,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
if (SCALFMM_LIBRARIES)
list(REMOVE_DUPLICATES SCALFMM_LIBRARIES)
endif()
list(APPEND FUSE_LIST "FFT")
#
# C++ 2011
......@@ -568,9 +566,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
if(SCALFMM_USE_CUDA)
list(APPEND STARPU_COMPONENT_LIST "CUDA")
else()
list(APPEND FUSE_LIST "CUDA")
endif()
list(APPEND FUSE_LIST "CUDA")
if(SCALFMM_USE_MPI)
list(APPEND STARPU_COMPONENT_LIST "MPI")
......@@ -582,9 +579,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
list(APPEND STARPU_COMPONENT_LIST "OPENCL")
# include_directories($ENV{OPENCL_INC})
# SET(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES};-L$ENV{OPENCL_LIB};-lOpenCL")
else()
list(APPEND FUSE_LIST "OPENCL")
endif()
list(APPEND FUSE_LIST "OPENCL")
find_package(STARPU ${SCALFMM_STARPU_VERSION} REQUIRED
......@@ -620,7 +616,6 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
endforeach()
else()
# StarPU not found
list(APPEND FUSE_LIST "STARPU")
endif()
......@@ -638,12 +633,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
# Adding SimGrid includes
set(SCALFMM_INCLUDES "${SCALFMM_INCLUDES};$ENV{SIMGRID_INCLUDE}")
message(STATUS " Adding SIMGRID = $ENV{SIMGRID_INCLUDE}")
else()
list(APPEND FUSE_LIST "STARPU")
list(APPEND FUSE_LIST "CUDA")
list(APPEND FUSE_LIST "OPENCL")
endif(SCALFMM_USE_STARPU)
list(APPEND FUSE_LIST "STARPU")
##################################################################
# Use SSE #
......@@ -671,10 +662,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
endif()
#set(SCALFMM_USE_AVX OFF)
else(${COMPILE_SSE})
list(APPEND FUSE_LIST "SSE")
message(FATAL_ERROR "SSE NOT SUPPORTED ; Set SCALFMM_USE_SSE to OFF \n Output from test is : ${COMPILE_SSE_OUTPUT}")
endif(${COMPILE_SSE})
endif()
list(APPEND FUSE_LIST "SSE")
##################################################################
# Use AVX #
......@@ -709,10 +700,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
message(STATUS ${CMAKE_CXX_FLAGS} )
else(${COMPILE_AVX})
list(APPEND FUSE_LIST "AVX")
message(FATAL_ERROR "AVX NOT SUPPORTED ; Set SCALFMM_USE_AVX to OFF \n Output from test is : ${COMPILE_AVX_OUTPUT} ")
endif(${COMPILE_AVX})
endif(SCALFMM_USE_AVX)
list(APPEND FUSE_LIST "AVX")
#
# Error if both SCALFMM_USE_AVX AND SCALFMM_USE_SSE are set
#
......@@ -745,10 +736,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
message(STATUS ${CMAKE_CXX_FLAGS} )
else(${COMPILE_AVX2})
list(APPEND FUSE_LIST "AVX2")
message(FATAL_ERROR "AVX2 NOT SUPPORTED ; Set SCALFMM_USE_AVX2 to OFF \n Output from test is : ${COMPILE_AVX_OUTPUT} ")
endif(${COMPILE_AVX2})
endif(SCALFMM_USE_AVX2)
list(APPEND FUSE_LIST "AVX2")
#
# Error if both SCALFMM_USE_AVX2 AND SCALFMM_USE_SSE are set
#
......@@ -808,9 +799,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
endif(SCALFMM_USE_EZTRACE)
if(NOT SCALFMM_USE_OMP4)
list(APPEND FUSE_LIST "OMP4")
endif()
list(APPEND FUSE_LIST "OMP4")
##################################################################
#
......
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