Преглед на файлове

Merge pull request #2509 from pkoller/pkoller-patch-1

additional changes in cmake template to find correct toolset version
Kim Kulling преди 6 години
родител
ревизия
43375eafb7
променени са 2 файла, в които са добавени 10 реда и са изтрити 2 реда
  1. 5 1
      assimpTargets-debug.cmake.in
  2. 5 1
      assimpTargets-release.cmake.in

+ 5 - 1
assimpTargets-debug.cmake.in

@@ -23,8 +23,12 @@ if(MSVC)
       set(MSVC_PREFIX "vc110")
     elseif( MSVC12 )
       set(MSVC_PREFIX "vc120")
-    elseif( MSVC14 )
+    elseif( MSVC_VERSION LESS 1910)
       set(MSVC_PREFIX "vc140")
+    elseif( MSVC_VERSION LESS 1920)
+      set(MSVC_PREFIX "vc141")
+    elseif( MSVC_VERSION LESS 1930)
+      set(MSVC_PREFIX "vc142")
     else()
       set(MSVC_PREFIX "vc150")
     endif()

+ 5 - 1
assimpTargets-release.cmake.in

@@ -23,8 +23,12 @@ if(MSVC)
       set(MSVC_PREFIX "vc110")
     elseif( MSVC12 )
       set(MSVC_PREFIX "vc120")
-    elseif( MSVC14 )
+    elseif( MSVC_VERSION LESS 1910)
       set(MSVC_PREFIX "vc140")
+    elseif( MSVC_VERSION LESS 1920)
+      set(MSVC_PREFIX "vc141")
+    elseif( MSVC_VERSION LESS 1930)
+      set(MSVC_PREFIX "vc142")
     else()
       set(MSVC_PREFIX "vc150")
     endif()