Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 095540a1 authored by hhakim's avatar hhakim
Browse files

Minor change.

Remove \n from gcc/c++ output.
parent cb5ae67b
No related branches found
No related tags found
No related merge requests found
...@@ -180,12 +180,13 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab") ...@@ -180,12 +180,13 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab")
message(STATUS "MATLAB_ROOT has been found : ${MATLAB_ROOT}") message(STATUS "MATLAB_ROOT has been found : ${MATLAB_ROOT}")
# verify that if gcc compiler is used then its version matches matlab version # verify that if gcc compiler is used then its version matches matlab version
message(STATUS "Checking gcc version matches matlab version...")
string(REGEX REPLACE "^.*/(R[0-9]+[a-z])$" "\\1" MATLAB_VERSION ${MATLAB_ROOT}) string(REGEX REPLACE "^.*/(R[0-9]+[a-z])$" "\\1" MATLAB_VERSION ${MATLAB_ROOT})
if(${CMAKE_CXX_COMPILER} MATCHES "/(c[+]+|gcc|g[+]+)(.exe)?$") # cmake doesn't handle exact char counting with {n} if(${CMAKE_CXX_COMPILER} MATCHES "/(c[+]+|gcc|g[+]+)(.exe)?$") # cmake doesn't handle exact char counting with {n}
# message(STATUS ${CMAKE_CXX_COMPILER}) # message(STATUS ${CMAKE_CXX_COMPILER})
exec_program(${CMAKE_CXX_COMPILER} ARGS "--version" OUTPUT_VARIABLE GCC_VERSION) exec_program(${CMAKE_CXX_COMPILER} ARGS "--version" OUTPUT_VARIABLE GCC_VERSION)
string(REGEX REPLACE "\n" "" GCC_VERSION ${GCC_VERSION})
if(NOT ${GCC_VERSION} MATCHES "LLVM") if(NOT ${GCC_VERSION} MATCHES "LLVM")
message(STATUS "Checking gcc version matches matlab version...")
#message(STATUS "GCC version is: " ${GCC_VERSION}) #message(STATUS "GCC version is: " ${GCC_VERSION})
string(REGEX REPLACE ".*([0-9]\\.[0-9])\\.[0-9].*" "\\1" GCC_VER_MAJOR_MINOR ${GCC_VERSION}) string(REGEX REPLACE ".*([0-9]\\.[0-9])\\.[0-9].*" "\\1" GCC_VER_MAJOR_MINOR ${GCC_VERSION})
if(${MATLAB_VERSION} MATCHES "R2017a" AND NOT ${GCC_VER_MAJOR_MINOR} VERSION_EQUAL "4.9") if(${MATLAB_VERSION} MATCHES "R2017a" AND NOT ${GCC_VER_MAJOR_MINOR} VERSION_EQUAL "4.9")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment