summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Korous <jkorous@apple.com>2019-03-26 03:48:25 +0000
committerJan Korous <jkorous@apple.com>2019-03-26 03:48:25 +0000
commit2d000e395ecc275b0aceeff942db71dad86fbf79 (patch)
tree12d47a33952bd147ad8ed58d4514215eeb55136d
parentfd880d30b194a526cda07f5ca3218a71b42ae3ee (diff)
downloadbcm5719-llvm-2d000e395ecc275b0aceeff942db71dad86fbf79.tar.gz
bcm5719-llvm-2d000e395ecc275b0aceeff942db71dad86fbf79.zip
[clangd][xpc][cmake] Respect explicit value of CLANGD_BUILD_XPC
We shouldn't prevent user from disabling XPC framework build on Darwin. However, by keeping it on by default our CI systems also test it by default on macOS. Based on user request: http://lists.llvm.org/pipermail/cfe-dev/2019-March/061778.html Differential Revision: https://reviews.llvm.org/D59808 llvm-svn: 356974
-rw-r--r--clang-tools-extra/CMakeLists.txt13
1 files changed, 10 insertions, 3 deletions
diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt
index 66ebeaeeaa3..514b17fb3c0 100644
--- a/clang-tools-extra/CMakeLists.txt
+++ b/clang-tools-extra/CMakeLists.txt
@@ -1,6 +1,13 @@
-option(CLANGD_BUILD_XPC "Build XPC Support For Clangd." OFF)
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- set(CLANGD_BUILD_XPC ON CACHE BOOL "" FORCE)
+if (NOT DEFINED CLANGD_BUILD_XPC)
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ set(CLANGD_BUILD_XPC_DEFAULT ON)
+ else ()
+ set(CLANGD_BUILD_XPC_DEFAULT OFF)
+ endif ()
+
+ set(CLANGD_BUILD_XPC ${CLANGD_BUILD_XPC_DEFAULT} CACHE BOOL "Build XPC Support For Clangd." FORCE)
+
+ unset(CLANGD_BUILD_XPC_DEFAULT)
endif ()
add_subdirectory(clang-apply-replacements)
OpenPOWER on IntegriCloud