Inicio Explorar Axuda
Iniciar sesión
software
/
assimp.assimp
réplica de https://github.com/assimp/assimp.git
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

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

additional changes in cmake template to find correct toolset version
Kim Kulling %!s(int64=6) %!d(string=hai) anos
pai
8d0567f727 8ec3aaed7d
achega
43375eafb7
Modificáronse 2 ficheiros con 10 adicións e 2 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 5 1
      assimpTargets-debug.cmake.in
  2. 5 1
      assimpTargets-release.cmake.in

+ 5 - 1
assimpTargets-debug.cmake.in
Ver ficheiro 

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

+ 5 - 1
assimpTargets-release.cmake.in
Ver ficheiro 

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