diff --git a/CMakeLists.txt b/CMakeLists.txt
index 338d86cab72b8b9e16b19a93c537cb4f4c2bf423..6fe2eb6017052c0fae4cd1b6ddfbbf333a1fb566 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -369,10 +369,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
string(FIND ${CMAKE_CXX_COMPILER} "icl++" NAME)
if( ${NAME} GREATER 0)
if( ${INTEL_VERSION} EQUAL 15. OR ${INTEL_VERSION} GREATER 15.0.0)
- message( STATUS " Intel compiler is icl++ ( version >= 15.0.0)")
- set(INTEL_ICL_COMPILER "ON")
+ message( STATUS " Intel compiler is icl++ ( version >= 15.0.0)")
+ set(INTEL_ICL_COMPILER "ON")
else()
- message(FATAL_ERROR " Intel compiler should be icl++ ( version >= 15.0.0)")
+ message(FATAL_ERROR " Intel compiler should be icl++ ( version >= 15.0.0)")
endif()
else()
message(FATAL_ERROR " Intel compiler should be icl++ ( version >= 15.0.0)")
@@ -445,6 +445,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif()
endforeach()
+ # TODO: is this very useful? CUDA is already a component of find starpu
if (CUDA_LIBRARIES)
set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}; ${CUDA_LIBRARIES}")
endif()
@@ -455,6 +456,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
message(STATUS " STARPU_INCLUDES = ${STARPU_INCLUDE_DIRS}")
endif()
+ # TODO: replace this by a component of find starpu
OPTION( ScalFMM_USE_OPENCL "Set to ON to use OPENCL with StarPU" OFF )
MESSAGE( STATUS "ScalFMM_USE_OPENCL = ${ScalFMM_USE_OPENCL}" )
if(ScalFMM_USE_OPENCL)
@@ -490,7 +492,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
if( NOT ${COMPILE_RESULT_VAR})
set(__SSEPE_INTEL_COMPILER ON)
endif()
- # set(ScalFMM_USE_AVX OFF)
+ #set(ScalFMM_USE_AVX OFF)
else(${COMPILE_SSE})
message(FATAL_ERROR "SSE NOT SUPPORTED ; Set ScalFMM_USE_SSE to OFF \n Output from test is : ${COMPILE_SSE_OUTPUT}")
endif(${COMPILE_SSE})
@@ -513,7 +515,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
OUTPUT_VARIABLE COMPILE_AVX_OUTPUT)
if(${COMPILE_AVX})
set(ScalFMM_CXX_FLAGS "${ScalFMM_CXX_FLAGS} ${AVX_FLAGS}")
- # set( ScalFMM_USE_SSE OFF FORCE) # ne marche pas
+ #set( ScalFMM_USE_SSE OFF FORCE) # ne marche pas
try_compile(COMPILE_RESULT_AVSPE ${CMAKE_CURRENT_BINARY_DIR}
${ScalFMM_CMAKE_MODULE_PATH}/checkAVXpe.cpp
COMPILE_DEFINITIONS "${CMAKE_CXX_FLAGS} ${AVX_FLAGS}")
@@ -544,7 +546,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmic")
else()
- # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xhost")
+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xhost")
endif()
list(APPEND FUSE_LIST "MIC")
##################################################################
diff --git a/CMakeModules/morse/find/FindCBLAS.cmake b/CMakeModules/morse/find/FindCBLAS.cmake
index f75ed4b0ca4c180390ad040ef799ada6c4dba6a5..28651763d71d443935068e7dd4200abbf1bdc0fe 100644
--- a/CMakeModules/morse/find/FindCBLAS.cmake
+++ b/CMakeModules/morse/find/FindCBLAS.cmake
@@ -296,6 +296,7 @@ if (BLAS_FOUND)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(CBLAS_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindCHAMELEON.cmake b/CMakeModules/morse/find/FindCHAMELEON.cmake
index 2478fe8e4d9f66ea0cd5613e4a9b8346bafed417..2347087606f83897b512becdbe960dee28ba7171 100644
--- a/CMakeModules/morse/find/FindCHAMELEON.cmake
+++ b/CMakeModules/morse/find/FindCHAMELEON.cmake
@@ -699,6 +699,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND O
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(CHAMELEON_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindFFTW.cmake b/CMakeModules/morse/find/FindFFTW.cmake
index ad742325f00f04d7ecb798878d569924a7ad6fcc..cf9e46ea69f32d755dfe7742f4cf370cb1bb97f0 100644
--- a/CMakeModules/morse/find/FindFFTW.cmake
+++ b/CMakeModules/morse/find/FindFFTW.cmake
@@ -385,6 +385,7 @@ if( NOT FFTW_FOUND )
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
list(APPEND CMAKE_REQUIRED_FLAGS "${REQUIRED_FLAGS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(FFTW_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindFXT.cmake b/CMakeModules/morse/find/FindFXT.cmake
index 6a0e3f2f46deec7778a4fe0a16e03f1b81f7baf2..cb664cf29c49bdaa88860234768f414d1bb624da 100644
--- a/CMakeModules/morse/find/FindFXT.cmake
+++ b/CMakeModules/morse/find/FindFXT.cmake
@@ -228,6 +228,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT FXT_FOUND) OR NOT FXT_FOUND OR FXT_DIR)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(FXT_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindHWLOC.cmake b/CMakeModules/morse/find/FindHWLOC.cmake
index 4c3be8d792d2a5014240c2a890d418a9c4d4c712..ebdaac40722abee4d86a3a787e6c5a2ff2968160 100644
--- a/CMakeModules/morse/find/FindHWLOC.cmake
+++ b/CMakeModules/morse/find/FindHWLOC.cmake
@@ -235,6 +235,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR NOT HWLOC_FOUND OR HWLOC_
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(HWLOC_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindLAPACKE.cmake b/CMakeModules/morse/find/FindLAPACKE.cmake
index 43c7470295c1b2865b0fb101713729530f0cde07..f4da7eb9f75d2f3e37d4cb912bab84a9a07e7701 100644
--- a/CMakeModules/morse/find/FindLAPACKE.cmake
+++ b/CMakeModules/morse/find/FindLAPACKE.cmake
@@ -299,6 +299,7 @@ if (LAPACK_FOUND)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(LAPACKE_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindMAGMA.cmake b/CMakeModules/morse/find/FindMAGMA.cmake
index 53f8573289848c74c196970900235b5698a4595e..254aa75b58e571f17ad4568e16a0ea3484bbf26c 100644
--- a/CMakeModules/morse/find/FindMAGMA.cmake
+++ b/CMakeModules/morse/find/FindMAGMA.cmake
@@ -343,6 +343,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT MAGMA_FOUND) OR NOT MAGMA_FOUND OR MAGMA_
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(MAGMA_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindMETIS.cmake b/CMakeModules/morse/find/FindMETIS.cmake
index f41f788c8ecf320d4fb818a862a67a7b1a5adfeb..021f92f0b3fd43467cf0248dbbc9aa1a13f9b1c8 100644
--- a/CMakeModules/morse/find/FindMETIS.cmake
+++ b/CMakeModules/morse/find/FindMETIS.cmake
@@ -193,6 +193,7 @@ if(METIS_LIBRARIES)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(METIS_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindMUMPS.cmake b/CMakeModules/morse/find/FindMUMPS.cmake
index 9d99eb561fbfb5fa25c70344e68a3ce93f5699bc..d65ba42776566a9049c1b1c32a30f9d1cd141be2 100644
--- a/CMakeModules/morse/find/FindMUMPS.cmake
+++ b/CMakeModules/morse/find/FindMUMPS.cmake
@@ -570,6 +570,7 @@ if(MUMPS_LIBRARIES)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
include(CheckFortranFunctionExists)
diff --git a/CMakeModules/morse/find/FindPARMETIS.cmake b/CMakeModules/morse/find/FindPARMETIS.cmake
index 75e59a4f0528acbd7dd537cd896160275f378298..07300069e9f44f555af03c11f25912ae97ec5623 100644
--- a/CMakeModules/morse/find/FindPARMETIS.cmake
+++ b/CMakeModules/morse/find/FindPARMETIS.cmake
@@ -193,6 +193,7 @@ if(PARMETIS_LIBRARIES)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(PARMETIS_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindPASTIX.cmake b/CMakeModules/morse/find/FindPASTIX.cmake
index 59bcb2ed898c52669f2ff330b0571e0dc894a839..ba0df89c2b5b29e667092f2678c7221f6750b360 100644
--- a/CMakeModules/morse/find/FindPASTIX.cmake
+++ b/CMakeModules/morse/find/FindPASTIX.cmake
@@ -603,6 +603,7 @@ if(PASTIX_LIBRARIES)
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
list(APPEND CMAKE_REQUIRED_FLAGS "${REQUIRED_FLAGS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(PASTIX_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindPTSCOTCH.cmake b/CMakeModules/morse/find/FindPTSCOTCH.cmake
index bb62202212ee0f5b02827107474338e4d03d6053..e6535c65a664f69f925c2011e5a6d3e571ee8dd8 100644
--- a/CMakeModules/morse/find/FindPTSCOTCH.cmake
+++ b/CMakeModules/morse/find/FindPTSCOTCH.cmake
@@ -250,6 +250,7 @@ if(PTSCOTCH_LIBRARIES)
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
list(APPEND CMAKE_REQUIRED_FLAGS "${REQUIRED_FLAGS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(PTSCOTCH_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindQUARK.cmake b/CMakeModules/morse/find/FindQUARK.cmake
index 7dbf0b4e12926d1e853e993852452308d9bd96d2..68e7923f603d1f15ad634dea5e5186e9a24487ab 100644
--- a/CMakeModules/morse/find/FindQUARK.cmake
+++ b/CMakeModules/morse/find/FindQUARK.cmake
@@ -253,6 +253,7 @@ if(QUARK_LIBRARIES)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(QUARK_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindSCOTCH.cmake b/CMakeModules/morse/find/FindSCOTCH.cmake
index 8b7eace5d6e52d23637150c32d9c6fbc68d09fef..0a5c2898fcf87aa7a964dd39beca21b4f5f37d21 100644
--- a/CMakeModules/morse/find/FindSCOTCH.cmake
+++ b/CMakeModules/morse/find/FindSCOTCH.cmake
@@ -220,6 +220,7 @@ if(SCOTCH_LIBRARIES)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(SCOTCH_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindSTARPU.cmake b/CMakeModules/morse/find/FindSTARPU.cmake
index ff166ceb339ca10823c174ceea60fea2992517b1..bc8158fbb6e9f97f7e7035b586b7dc783960aa7d 100644
--- a/CMakeModules/morse/find/FindSTARPU.cmake
+++ b/CMakeModules/morse/find/FindSTARPU.cmake
@@ -231,6 +231,7 @@ if(PKG_CONFIG_EXECUTABLE)
endif()
set(STARPU_INCLUDE_DIRS_DEP "${STARPU_INCLUDE_DIRS}")
set(STARPU_LIBRARY_DIRS_DEP "${STARPU_LIBRARY_DIRS}")
+ set(STARPU_LIBRARIES_DEP "${STARPU_LIBRARIES}")
endif()
@@ -732,6 +733,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
list(APPEND CMAKE_REQUIRED_FLAGS "${REQUIRED_FLAGS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(STARPU_WORKS CACHE)
diff --git a/CMakeModules/morse/find/FindTMG.cmake b/CMakeModules/morse/find/FindTMG.cmake
index 83b65ad49e7da447183a6e21d67499f16f866cc0..fff4cccde767ad309ab8babacf6a2e6233c2b356 100644
--- a/CMakeModules/morse/find/FindTMG.cmake
+++ b/CMakeModules/morse/find/FindTMG.cmake
@@ -220,6 +220,7 @@ if (LAPACK_FOUND)
list(APPEND CMAKE_REQUIRED_LIBRARIES "-L${lib_dir}")
endforeach()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${REQUIRED_LIBS}")
+ string(REGEX REPLACE "^ -" "-" CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
# test link
unset(TMG_WORKS CACHE)