diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-10-14 07:40:34 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-10-14 07:40:34 +0000 |
| commit | 68ddd150f8636b105ec8638edd049d55b7673cbd (patch) | |
| tree | 73f84102f991935d9453549584f1cd58be982bda | |
| parent | 6fcc62faeeac36e87281b2bf6c882dd9e14b8acc (diff) | |
| download | bcm5719-llvm-68ddd150f8636b105ec8638edd049d55b7673cbd.tar.gz bcm5719-llvm-68ddd150f8636b105ec8638edd049d55b7673cbd.zip | |
[CMake] Fixing the bots I broke.
I meant to put the POLICY setting below the version defaults.
llvm-svn: 250276
| -rw-r--r-- | llvm/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 22b90e89f43..a1713fbb8f9 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -20,13 +20,6 @@ if (POLICY CMP0051) cmake_policy(SET CMP0051 OLD) endif() -if (POLICY CMP0048) - cmake_policy(SET CMP0048 NEW) - set(cmake_3_0_PROJ_VERSION - VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}) - set(cmake_3_0_LANGUAGES LANGUAGES) -endif() - if(CMAKE_VERSION VERSION_LESS 3.1.20141117) set(cmake_3_2_USES_TERMINAL) else() @@ -38,6 +31,13 @@ set(LLVM_VERSION_MINOR 8) set(LLVM_VERSION_PATCH 0) set(LLVM_VERSION_SUFFIX svn) +if (POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) + set(cmake_3_0_PROJ_VERSION + VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}) + set(cmake_3_0_LANGUAGES LANGUAGES) +endif() + if (NOT PACKAGE_VERSION) set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}") |
