When building StaticAnalyzer/Frontend add -I "<Checkers build dir>" to allow Checkers...

included without '..', thus being compatible with build systems of *BSDs.

Patch by Joerg Sonnenberger!

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@125758 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/StaticAnalyzer/Checkers/ClangSACheckers.h b/lib/StaticAnalyzer/Checkers/ClangSACheckers.h
index 51cad5bc83ebdc05c7e16e352d84736d2c3c639c..b01b0f4c5442399c9175c178e3a882e5e93aece6 100644 (file)
--- a/lib/StaticAnalyzer/Checkers/ClangSACheckers.h
+++ b/lib/StaticAnalyzer/Checkers/ClangSACheckers.h
@@ -23,7 +23,7 @@ class ExprEngine;
 #define GET_CHECKERS
 #define CHECKER(FULLNAME,CLASS,CXXFILE,HELPTEXT,HIDDEN)    \
   void register##CLASS(ExprEngine &Eng);
-#include "../Checkers/Checkers.inc"
+#include "Checkers.inc"
 #undef CHECKER
 #undef GET_CHECKERS
 

diff --git a/lib/StaticAnalyzer/Frontend/CMakeLists.txt b/lib/StaticAnalyzer/Frontend/CMakeLists.txt
index 505c0cf440298be0b46a1d66203d7f00d6fd9739..cf47c47dad148e0fa5e5ce4d7290477676d64922 100644 (file)
--- a/lib/StaticAnalyzer/Frontend/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Frontend/CMakeLists.txt
@@ -2,6 +2,8 @@ set(LLVM_NO_RTTI 1)
 
 set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
 
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../Checkers )
+
 add_clang_library(clangStaticAnalyzerFrontend
   AnalysisConsumer.cpp
   CheckerRegistration.cpp

diff --git a/lib/StaticAnalyzer/Frontend/Makefile b/lib/StaticAnalyzer/Frontend/Makefile
index 1e6561e555b5677e483537c0690a90ceea5743f8..2698120d9098de092b8e43bead31afec453fb7da 100644 (file)
--- a/lib/StaticAnalyzer/Frontend/Makefile
+++ b/lib/StaticAnalyzer/Frontend/Makefile
@@ -14,4 +14,6 @@
 CLANG_LEVEL := ../../..
 LIBRARYNAME := clangStaticAnalyzerFrontend
 
+CPP.Flags += -I${PROJ_OBJ_DIR}/../Checkers
+
 include $(CLANG_LEVEL)/Makefile