[PATCH] D60919: [gn] Move Features.inc to clangd, create a config for it
Petr Hosek via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Sat Apr 20 18:10:44 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL358837: [gn] Move Features.inc to clangd, create a config for it (authored by phosek, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D60919?vs=195907&id=195983#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D60919/new/
https://reviews.llvm.org/D60919
Files:
llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
Index: llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
@@ -1,7 +1,29 @@
+import("//clang-tools-extra/clangd/xpc/enable.gni")
+import("//llvm/utils/gn/build/write_cmake_config.gni")
+
+config("features_config") {
+ # To pick up the generated inc files.
+ include_dirs = [ target_gen_dir ]
+ visibility = [ ":features" ]
+}
+
+write_cmake_config("features") {
+ input = "Features.inc.in"
+ output = "$target_gen_dir/Features.inc"
+ values = []
+ if (clangd_build_xpc) {
+ values += [ "CLANGD_BUILD_XPC=1" ]
+ } else {
+ values += [ "CLANGD_BUILD_XPC=0" ]
+ }
+ public_configs = [ ":features_config" ]
+}
+
static_library("clangd") {
output_name = "clangDaemon"
configs += [ "//llvm/utils/gn/build:clang_code" ]
deps = [
+ ":features",
"//clang-tools-extra/clang-tidy/abseil",
"//clang-tools-extra/clang-tidy/android",
"//clang-tools-extra/clang-tidy/boost",
Index: llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
@@ -1,25 +1,12 @@
import("//clang-tools-extra/clangd/xpc/enable.gni")
-import("//llvm/utils/gn/build/write_cmake_config.gni")
-
-write_cmake_config("features") {
- # FIXME: Try moving Features.inc.in to tools, seems like a better location.
- input = "../Features.inc.in"
- output = "$target_gen_dir/Features.inc"
- values = []
- if (clangd_build_xpc) {
- values += [ "CLANGD_BUILD_XPC=1" ]
- } else {
- values += [ "CLANGD_BUILD_XPC=0" ]
- }
-}
executable("clangd") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
deps = [
- ":features",
"//clang-tools-extra/clang-tidy",
"//clang-tools-extra/clangd",
+ "//clang-tools-extra/clangd:features",
"//clang-tools-extra/clangd/refactor/tweaks",
"//clang/lib/AST",
"//clang/lib/Basic",
@@ -37,12 +24,7 @@
]
}
- include_dirs = [
- "..",
-
- # To pick up the generated inc files.
- "$target_gen_dir",
- ]
+ include_dirs = [ ".." ]
sources = [
"ClangdMain.cpp",
]
Index: llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
@@ -5,6 +5,7 @@
deps = [
"//clang-tools-extra/clang-tidy",
"//clang-tools-extra/clangd",
+ "//clang-tools-extra/clangd:features",
"//clang-tools-extra/clangd/refactor/tweaks",
"//clang/lib/AST",
"//clang/lib/Basic",
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60919.195983.patch
Type: text/x-patch
Size: 2959 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190421/48e08e9c/attachment.bin>
More information about the llvm-commits
mailing list