Skip to content
This repository was archived by the owner on Sep 2, 2018. It is now read-only.

Commit 5bd68ee

Browse files
author
Chris Bieneman
committed
[CMake] We shouldn't be storing values in the cache unless they actually need CMake cache behavior.
add_llvm_external_project puts LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR into the cache even if it is just the in-tree default path. This causes all sorts of oddness, and makes it so that I can't change the behavior of this variable. This patch never puts LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR into the cache. It will only end up in the cache if it is specified on the command line, which is the correct behavior. There is also a temporary change to remove non-default values from the cache if they are already present. This should have the impact of cleaning out unncecissary values from the caches on the buildbots and people's local build directories. This part of the change is marked with a TODO and can be removed in a few days. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242102 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent ec6cc05 commit 5bd68ee

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

cmake/modules/AddLLVM.cmake

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -689,10 +689,15 @@ macro(add_llvm_external_project name)
689689
list(APPEND LLVM_IMPLICIT_PROJECT_IGNORE "${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir}")
690690
string(REPLACE "-" "_" nameUNDERSCORE ${name})
691691
string(TOUPPER ${nameUNDERSCORE} nameUPPER)
692-
set(LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir}"
693-
CACHE PATH "Path to ${name} source directory")
694-
if (NOT ${LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR} STREQUAL ""
695-
AND EXISTS ${LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR}/CMakeLists.txt)
692+
#TODO: Remove this check in a few days once it has circulated through
693+
# buildbots and people's checkouts (cbieneman - July 14, 2015)
694+
if(${LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR} STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir}")
695+
unset(LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR CACHE)
696+
endif()
697+
if(NOT LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR)
698+
set(LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir}")
699+
endif()
700+
if (EXISTS ${LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR}/CMakeLists.txt)
696701
option(LLVM_EXTERNAL_${nameUPPER}_BUILD
697702
"Whether to build ${name} as part of LLVM" ON)
698703
if (LLVM_EXTERNAL_${nameUPPER}_BUILD)

0 commit comments

Comments
 (0)