From 18cbe89a4c648d8883e0bd8bd89d99b01e6f0eb8 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 21 Sep 2022 13:45:21 +0200 Subject: [PATCH] Introduce newer versions for MSVC Version --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62bbd0a43..2db0c4b8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -560,7 +560,11 @@ IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) SET(C4D_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Cineware/includes") # pick the correct prebuilt library - IF(MSVC15) + IF(MSVC143) + SET(C4D_LIB_POSTFIX "_2022") + ELSEIF(MSV142) + SET(C4D_LIB_POSTFIX "_2019") + ELSEIF(MSVC15) SET(C4D_LIB_POSTFIX "_2017") ELSEIF(MSVC14) SET(C4D_LIB_POSTFIX "_2015") @@ -572,7 +576,7 @@ IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) SET(C4D_LIB_POSTFIX "_2010") ELSE() MESSAGE( FATAL_ERROR - "C4D is currently only supported with MSVC 10, 11, 12, 14" + "C4D is currently only supported with MSVC 10, 11, 12, 14, 14.2, 14.3" ) ENDIF() @@ -804,6 +808,10 @@ if(WIN32) SET(ASSIMP_MSVC_VERSION "vc140") ELSEIF(MSVC15) SET(ASSIMP_MSVC_VERSION "vc141") + ELSEIF(MSV142) + SET(ASSIMP_MSVC_VERSION "vc142") + ELSEIF(MSVC143) + SET(ASSIMP_MSVC_VERSION "vc143") ENDIF() ENDIF()