[PATCH] D113664: [cmake] use project relative paths when generating ASTNodeAPI.json

[Matheus Izvekov via Phabricator via cfe-commits]

mizvekov created this revision.
Herald added a subscriber: mgorny.
mizvekov published this revision for review.
mizvekov added reviewers: steveire, phosek.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Signed-off-by: Matheus Izvekov <mizve...@gmail.com>


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D113664

Files:
  clang/lib/Tooling/CMakeLists.txt


Index: clang/lib/Tooling/CMakeLists.txt
===================================================================
--- clang/lib/Tooling/CMakeLists.txt
+++ clang/lib/Tooling/CMakeLists.txt
@@ -60,11 +60,11 @@
       $<TARGET_FILE:clang-ast-dump>
         # Skip this in debug mode because parsing AST.h is too slow
         --skip-processing=${skip_expensive_processing}
-        -I ${CMAKE_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include
-        -I ${CMAKE_SOURCE_DIR}/../clang/include
-        -I ${CMAKE_BINARY_DIR}/tools/clang/include
-        -I ${CMAKE_BINARY_DIR}/include
-        -I ${CMAKE_SOURCE_DIR}/include
+        -I ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include
+        -I ${CLANG_SOURCE_DIR}/include
+        -I ${LLVM_BINARY_DIR}/tools/clang/include
+        -I ${LLVM_BINARY_DIR}/include
+        -I ${LLVM_SOURCE_DIR}/include
         ${implicitDirs}
         --json-output-path ${CMAKE_CURRENT_BINARY_DIR}/ASTNodeAPI.json
   )



Index: clang/lib/Tooling/CMakeLists.txt
===================================================================
--- clang/lib/Tooling/CMakeLists.txt
+++ clang/lib/Tooling/CMakeLists.txt
@@ -60,11 +60,11 @@
       $<TARGET_FILE:clang-ast-dump>
         # Skip this in debug mode because parsing AST.h is too slow
         --skip-processing=${skip_expensive_processing}
-        -I ${CMAKE_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include
-        -I ${CMAKE_SOURCE_DIR}/../clang/include
-        -I ${CMAKE_BINARY_DIR}/tools/clang/include
-        -I ${CMAKE_BINARY_DIR}/include
-        -I ${CMAKE_SOURCE_DIR}/include
+        -I ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include
+        -I ${CLANG_SOURCE_DIR}/include
+        -I ${LLVM_BINARY_DIR}/tools/clang/include
+        -I ${LLVM_BINARY_DIR}/include
+        -I ${LLVM_SOURCE_DIR}/include
         ${implicitDirs}
         --json-output-path ${CMAKE_CURRENT_BINARY_DIR}/ASTNodeAPI.json
   )

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits