From 437cd0d3d7843e6642c7e0538078e0f891e3c4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Tue, 5 Apr 2022 17:03:28 +0300 Subject: [PATCH] mdbx-cmake: minor refine version detection of Elbrus LCC compiler. --- cmake/compiler.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake index c00ded41..4aa4c366 100644 --- a/cmake/compiler.cmake +++ b/cmake/compiler.cmake @@ -89,9 +89,11 @@ if(CMAKE_C_COMPILER_LOADED) if(tmp_lcc_marker GREATER -1 AND tmp_e2k_marker GREATER tmp_lcc_marker) execute_process(COMMAND ${CMAKE_C_COMPILER} -print-version OUTPUT_VARIABLE CMAKE_C_COMPILER_VERSION - RESULT_VARIABLE tmp_lcc_probe_result) + RESULT_VARIABLE tmp_lcc_probe_result + OUTPUT_STRIP_TRAILING_WHITESPACE) set(CMAKE_COMPILER_IS_ELBRUSC ON) set(CMAKE_C_COMPILER_ID "Elbrus") + message(STATUS "Detected Elbrus C compiler ${CMAKE_C_COMPILER_VERSION}") else() set(CMAKE_COMPILER_IS_ELBRUSC OFF) endif() @@ -113,9 +115,11 @@ if(CMAKE_CXX_COMPILER_LOADED) if(tmp_lcc_marker GREATER -1 AND tmp_e2k_marker GREATER tmp_lcc_marker) execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-version OUTPUT_VARIABLE CMAKE_CXX_COMPILER_VERSION - RESULT_VARIABLE tmp_lxx_probe_result) + RESULT_VARIABLE tmp_lxx_probe_result + OUTPUT_STRIP_TRAILING_WHITESPACE) set(CMAKE_COMPILER_IS_ELBRUSCXX ON) set(CMAKE_CXX_COMPILER_ID "Elbrus") + message(STATUS "Detected Elbrus C++ compiler ${CMAKE_CXX_COMPILER_VERSION}") else() set(CMAKE_COMPILER_IS_ELBRUSCXX OFF) endif()