summaryrefslogtreecommitdiffstats
path: root/llvm/cmake/modules
diff options
context:
space:
mode:
authorFilipe Cabecinhas <me@filcab.net>2015-02-18 01:12:38 +0000
committerFilipe Cabecinhas <me@filcab.net>2015-02-18 01:12:38 +0000
commit3c7469396aad2a66196dbd8ac967ea9641941cf3 (patch)
treeda668e8ae0fd63d8d045f007a279e0fc049b762f /llvm/cmake/modules
parente990a3f60ccd34c0d9c1edebfc17a193b8c052cd (diff)
downloadbcm5719-llvm-3c7469396aad2a66196dbd8ac967ea9641941cf3.tar.gz
bcm5719-llvm-3c7469396aad2a66196dbd8ac967ea9641941cf3.zip
Downgrade build system error message to a warning
Instead of requiring MSVC 2013 U4, we simply warn users, since some might not bt able to immediately upgrade. llvm-svn: 229598
Diffstat (limited to 'llvm/cmake/modules')
-rw-r--r--llvm/cmake/modules/HandleLLVMOptions.cmake7
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
index 24af2f81ceb..ba6114a4f56 100644
--- a/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -41,8 +41,11 @@ int main() { return (float)x; }"
set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
endif()
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.31101)
- message(FATAL_ERROR "Host Visual Studio must be at least 2013 Update 4 (MSVC 18.0.31101)")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
+ message(FATAL_ERROR "Host Visual Studio must be at least 2013")
+ elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.31101)
+ message(WARNING "Host Visual Studio should at least be 2013 Update 4 (MSVC 18.0.31101)"
+ " due to miscompiles from earlier versions")
endif()
endif()
endif()
OpenPOWER on IntegriCloud