Reapply r229185(cbieneman) -- Raising minimum required Visual Studio version to 2013.

[oota-llvm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 475352de79662bd58a8b14b70b38d488aad60bd7..4f00395fd60be8e726251724309f2b75f9d54f3e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,10 @@ endif()
 
 project(LLVM)
 
+if (MSVC AND MSVC_VERSION LESS 1800)
+  message(FATAL_ERROR "Minimum required MSVC version is 2013!")
+endif ()
+
 # The following only works with the Ninja generator in CMake >= 3.0.
 set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING
   "Define the maximum number of concurrent compilation jobs.")
@@ -47,7 +51,7 @@ set(CMAKE_MODULE_PATH
   )
 
 set(LLVM_VERSION_MAJOR 3)
-set(LLVM_VERSION_MINOR 6)
+set(LLVM_VERSION_MINOR 7)
 set(LLVM_VERSION_PATCH 0)
 
 if (NOT PACKAGE_VERSION)
@@ -96,6 +100,9 @@ if(WIN32 AND NOT UNIX)
     "ExecWait '$INSTDIR/tools/msbuild/install.bat'")
   set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
     "ExecWait '$INSTDIR/tools/msbuild/uninstall.bat'")
+  if( CMAKE_CL_64 )
+    set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
+  endif()
 endif()
 include(CPack)