maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CMake] Fixing the bots I broke. 

I meant to put the POLICY setting below the version defaults.

llvm-svn: 250276
This commit is contained in:
Chris Bieneman 2015-10-14 07:40:34 +00:00
parent 6fcc62faee
commit 68ddd150f8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/CMakeLists.txt
View File

@ -20,13 +20,6 @@ if (POLICY CMP0051)
cmake_policy(SET CMP0051 OLD) cmake_policy(SET CMP0051 OLD)
endif() 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) if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
set(cmake_3_2_USES_TERMINAL) set(cmake_3_2_USES_TERMINAL)
else() else()
@ -38,6 +31,13 @@ set(LLVM_VERSION_MINOR 8)
set(LLVM_VERSION_PATCH 0) set(LLVM_VERSION_PATCH 0)
set(LLVM_VERSION_SUFFIX svn) 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) if (NOT PACKAGE_VERSION)
set(PACKAGE_VERSION set(PACKAGE_VERSION
"${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}") "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}")