From 7a36bf7b5c804d836365365f57796fc26f628114 Mon Sep 17 00:00:00 2001 From: Konstantin Kutscher <kutscher@irmb.tu-bs.de> Date: Tue, 21 Jan 2020 14:26:34 +0100 Subject: [PATCH] fix different subversion changes of VS 2019 --- source/CMake/CMakeCompilerMacros.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/CMake/CMakeCompilerMacros.txt b/source/CMake/CMakeCompilerMacros.txt index 7f58f8ba9..34a658c97 100644 --- a/source/CMake/CMakeCompilerMacros.txt +++ b/source/CMake/CMakeCompilerMacros.txt @@ -99,7 +99,12 @@ MACRO(SET_CAB_COMPILER) ELSEIF( ${MSVC_VERSION} MATCHES "1923" AND NOT CMAKE_CL_64) SET( CAB_COMPILER "msvc19_32" ) ELSE() - MESSAGE(FATAL_ERROR "unknown ms studio version MSVC_VERSION = " ${MSVC_VERSION}) + #MESSAGE(FATAL_ERROR "unknown ms studio version MSVC_VERSION = " ${MSVC_VERSION}) + IF(CMAKE_CL_64) + SET( CAB_COMPILER "msvc19_64" ) + ELSE() + SET( CAB_COMPILER "msvc19_32" ) + ENDIF() ENDIF() ELSE() EXEC_PROGRAM( ${CMAKE_CXX_COMPILER} -- GitLab