[llvm] r250276 - [CMake] Fixing the bots I broke.
Chris Bieneman via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 14 00:40:35 PDT 2015
Author: cbieneman
Date: Wed Oct 14 02:40:34 2015
New Revision: 250276
URL: http://llvm.org/viewvc/llvm-project?rev=250276&view=rev
Log:
[CMake] Fixing the bots I broke.
I meant to put the POLICY setting below the version defaults.
Modified:
llvm/trunk/CMakeLists.txt
Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=250276&r1=250275&r2=250276&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Oct 14 02:40:34 2015
@@ -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}")
More information about the llvm-commits
mailing list