Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 25701183 authored by Olivier Coulaud's avatar Olivier Coulaud

Fix pb with Intel 15.0

parent 183feec3
...@@ -176,19 +176,21 @@ endif(ScalFMM_USE_FFT) ...@@ -176,19 +176,21 @@ endif(ScalFMM_USE_FFT)
# #
# C++ 2011 # C++ 2011
#ADD_DEFINITIONS(-std=c++11) #ADD_DEFINITIONS(-std=c++11)
IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND APPLE) MESSAGE( "CMAKE_SYSTEM: ${CMAKE_SYSTEM} CMAKE_CXX_COMPILER_ID ${CMAKE_CXX_COMPILER_ID} CMAKE_CXX_COMPILER ${NAME}")
IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE INTEL_VERSION) execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE INTEL_VERSION)
string(FIND ${CMAKE_CXX_COMPILER} "icl++" NAME) MESSAGE( "Intel: ${INTEL_VERSION}")
MESSAGE( "CMAKE_SYSTEM: ${CMAKE_SYSTEM} CMAKE_CXX_COMPILER_ID ${CMAKE_CXX_COMPILER_ID} CMAKE_CXX_COMPILER ${NAME}") IF(APPLE)
MESSAGE( "Intel: ${INTEL_VERSION}") string(FIND ${CMAKE_CXX_COMPILER} "icl++" NAME)
if( ${NAME} GREATER 0) if( ${NAME} GREATER 0)
if( ${INTEL_VERSION} EQUAL 15. OR ${INTEL_VERSION} GREATER 15.0.0) if( ${INTEL_VERSION} EQUAL 15. OR ${INTEL_VERSION} GREATER 15.0.0)
MESSAGE( " Intel compiler is icl++ ( version >= 15.0.0)") MESSAGE( " Intel compiler is icl++ ( version >= 15.0.0)")
else() 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)")
endif() endif()
else()
MESSAGE(FATAL_ERROR " Intel compiler should be icl++ ( version >= 15.0.0)")
endif() endif()
endif() endif()
...@@ -213,10 +215,10 @@ if( ScalFMM_USE_SSE ) ...@@ -213,10 +215,10 @@ if( ScalFMM_USE_SSE )
IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
# Set flag for old intel compiler TODO # Set flag for old intel compiler TODO
MESSAGE(STATUS "INTEL COMPILER IS ${INTEL_VERSION} ") MESSAGE(STATUS "INTEL COMPILER IS ${INTEL_VERSION} ")
if( ${INTEL_VERSION} LESS "15.0.0") # if( ${INTEL_VERSION} LESS "15.0.0")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__OLD_INTEL_COMPILER") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__OLD_INTEL_COMPILER")
MESSAGE(STATUS "INTEL COMPILER LOWER 15.0.0") MESSAGE(STATUS "INTEL COMPILER LOWER 15.0.0")
ENDIF() # ENDIF()
ELSE() ELSE()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mfpmath=sse") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mfpmath=sse")
ENDIF() ENDIF()
...@@ -322,6 +324,7 @@ INSTALL(FILES ...@@ -322,6 +324,7 @@ INSTALL(FILES
# build a CPack driven installer package # build a CPack driven installer package
# #
# Use git commit number as CPACK_PACKAGE_VERSION_PATCH # Use git commit number as CPACK_PACKAGE_VERSION_PATCH
set(CPACK_PACKAGE_VERSION_PATCH 0)
execute_process( execute_process(
COMMAND git rev-list HEAD --count COMMAND git rev-list HEAD --count
OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH
......
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