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 a69d0220 authored by Berenger Bramas's avatar Berenger Bramas

Update cmake -- ensure we can choose the iSDE arch for the cmake detection stage

parent 0883f6f4
...@@ -25,8 +25,11 @@ OPTION( INASTEMP_ISDE_CPU "Set to ON to run the CPU detection over sde64" OFF ) ...@@ -25,8 +25,11 @@ OPTION( INASTEMP_ISDE_CPU "Set to ON to run the CPU detection over sde64" OFF )
# Compile and execute the file # Compile and execute the file
if(INASTEMP_ISDE_CPU) if(INASTEMP_ISDE_CPU)
SET( INASTEMP_ISDE_CPU_ARGS "-knl" CACHE STRING "Arguments for sde64" )
if($ENV{VERBOSE}) if($ENV{VERBOSE})
message(STATUS "GetCpuInfosFile -- use intel SDE") message(STATUS "GetCpuInfosFile -- use intel SDE")
message(STATUS "GetCpuInfosFile -- INASTEMP_ISDE_CPU_ARGS = ${INASTEMP_ISDE_CPU_ARGS}")
endif() endif()
get_filename_component( get_filename_component(
...@@ -47,7 +50,7 @@ if(INASTEMP_ISDE_CPU) ...@@ -47,7 +50,7 @@ if(INASTEMP_ISDE_CPU)
message(FATAL_ERROR "The GetCpuInfosFile compiled file does not exist (${GetCpuInfosFileExec})") message(FATAL_ERROR "The GetCpuInfosFile compiled file does not exist (${GetCpuInfosFileExec})")
endif() endif()
exec_program("sde64 -- ${GetCpuInfosFileExec}" ${CMAKE_CURRENT_BINARY_DIR} exec_program("sde64 ${INASTEMP_ISDE_CPU_ARGS} -- ${GetCpuInfosFileExec}" ${CMAKE_CURRENT_BINARY_DIR}
OUTPUT_VARIABLE run OUTPUT_VARIABLE run
RETURN_VALUE RUN_RESULT_VAR) RETURN_VALUE RUN_RESULT_VAR)
endif() endif()
......
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