diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-05-31 20:21:42 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-05-31 20:21:42 +0000 |
| commit | a5b0723993ed5f049539a8098cd1c43963743279 (patch) | |
| tree | 7401ba454d8d87095c289ecf2f6b5e81f06b8dea | |
| parent | f222670f5fad27731676bf9a244c95707393ad1f (diff) | |
[CMake] Update to requiring CMake 3.4.3
Summary:
This is as per the discussions on developer lists:
http://lists.llvm.org/pipermail/llvm-dev/2016-April/098780.html
http://lists.llvm.org/pipermail/llvm-dev/2016-May/100058.html
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D20824
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@271327 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | lib/builtins/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d5a20ed59..e093b74f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,16 +15,7 @@ else() set(COMPILER_RT_STANDALONE_BUILD FALSE) endif() -# The CompilerRT build system requires CMake version 2.8.8 or higher in order -# to use its support for building convenience "libraries" as a collection of -# .o files. This is particularly useful in producing larger, more complex -# runtime libraries. -if (NOT MSVC) - cmake_minimum_required(VERSION 2.8.8) -else() - # Version 2.8.12.1 is required to build with Visual Studio 2013. - cmake_minimum_required(VERSION 2.8.12.1) -endif() +cmake_minimum_required(VERSION 3.4.3) # FIXME: It may be removed when we use 2.8.12. if(CMAKE_VERSION VERSION_LESS 2.8.12) diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt index 2845c5715..42d1ae92c 100644 --- a/lib/builtins/CMakeLists.txt +++ b/lib/builtins/CMakeLists.txt @@ -3,7 +3,7 @@ # architecture-specific code in various subdirectories. if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - cmake_minimum_required(VERSION 2.8.12.1) + cmake_minimum_required(VERSION 3.4.3) project(CompilerRTBuiltins C ASM) set(COMPILER_RT_STANDALONE_BUILD TRUE) |