diff options
| author | Alp Toker <alp@nuanti.com> | 2014-06-06 06:39:00 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-06-06 06:39:00 +0000 |
| commit | 6ae079ee4ae0b33c393de1b2a16e70d2ae57a35a (patch) | |
| tree | fe43dfc161fa786b84fcdc45fab0d1d24be64571 | |
| parent | bf56d44cab281a7cec42c6c01caac8e7e7b3ea5c (diff) | |
| download | bcm5719-llvm-6ae079ee4ae0b33c393de1b2a16e70d2ae57a35a.tar.gz bcm5719-llvm-6ae079ee4ae0b33c393de1b2a16e70d2ae57a35a.zip | |
Make LINK_POLLY_INTO_TOOLS work with the CMake build
The option check was being performed after config.h/llvm-config.h substitution,
generating incorrect macro definitions.
Fixes PR19614.
llvm-svn: 210311
| -rw-r--r-- | llvm/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 0d6eead42f6..91695746f46 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -244,6 +244,9 @@ set(LLVM_USE_SANITIZER "" CACHE STRING option(LLVM_USE_SPLIT_DWARF "Use -gsplit-dwarf when compiling llvm." OFF) +option(WITH_POLLY "Build LLVM with Polly" ON) +option(LINK_POLLY_INTO_TOOLS "Static link Polly into tools" OFF) + # Define an option controlling whether we should build for 32-bit on 64-bit # platforms, where supported. if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 ) @@ -515,9 +518,6 @@ endif() add_subdirectory(projects) -option(WITH_POLLY "Build LLVM with Polly" ON) -option(LINK_POLLY_INTO_TOOLS "Static link Polly into tools" OFF) - if(WITH_POLLY) if(NOT EXISTS ${LLVM_MAIN_SRC_DIR}/tools/polly/CMakeLists.txt) set(WITH_POLLY OFF) |
