Commit: b67db67b012d688b3f0b4b1d12c45e33ea2ccaab
Author: lazydodo
Date: Sat Sep 10 17:58:56 2016 -0600
Branches: blender-v2.78-release
https://developer.blender.org/rBb67db67b012d688b3f0b4b1d12c45e33ea2ccaab
[CMAKE/Platform/Windows] Only perform version check if the actual compiler is
MSVC
===================================================================
M build_files/cmake/platform/platform_win32_msvc.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 2772944..4ba6f44 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -39,20 +39,22 @@ endmacro()
add_definitions(-DWIN32)
# Minimum MSVC Version
-if(MSVC_VERSION EQUAL 1800)
- set(_min_ver "18.0.31101")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
- message(FATAL_ERROR
- "Visual Studio 2013 (Update 4, ${_min_ver}) required, "
- "found (${CMAKE_CXX_COMPILER_VERSION})")
+if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+ if(MSVC_VERSION EQUAL 1800)
+ set(_min_ver "18.0.31101")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ message(FATAL_ERROR
+ "Visual Studio 2013 (Update 4, ${_min_ver})
required, "
+ "found (${CMAKE_CXX_COMPILER_VERSION})")
+ endif()
endif()
-endif()
-if(MSVC_VERSION EQUAL 1900)
- set(_min_ver "19.0.24210")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
- message(FATAL_ERROR
- "Visual Studio 2015 (Update 3, ${_min_ver}) required, "
- "found (${CMAKE_CXX_COMPILER_VERSION})")
+ if(MSVC_VERSION EQUAL 1900)
+ set(_min_ver "19.0.24210")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ message(FATAL_ERROR
+ "Visual Studio 2015 (Update 3, ${_min_ver})
required, "
+ "found (${CMAKE_CXX_COMPILER_VERSION})")
+ endif()
endif()
endif()
unset(_min_ver)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
