[cfe-commits] r125514 - in /cfe/trunk: CMakeLists.txt lib/StaticAnalyzer/Checkers/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Mon Feb 14 14:14:11 2011
New Revision: 125514

URL: http://llvm.org/viewvc/llvm-project?rev=125514&view=rev
Log:
Add current binary and source directories to the header search list
for all compiler invocations.

Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/lib/StaticAnalyzer/Checkers/CMakeLists.txt

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=125514&r1=125513&r2=125514&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Mon Feb 14 14:14:11 2011
@@ -38,6 +38,7 @@
   set(LLVM_MAIN_INCLUDE_DIR "${LLVM_MAIN_SRC_DIR}/include")
   set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})
 
+  set(CMAKE_INCLUDE_CURRENT_DIR ON)
   include_directories("${PATH_TO_LLVM_BUILD}/include" "${LLVM_MAIN_INCLUDE_DIR}")
   if( NOT PATH_TO_LLVM_BUILD STREQUAL LLVM_MAIN_SRC_DIR )
     include_directories("${LLVM_MAIN_INCLUDE_DIR}")

Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/CMakeLists.txt?rev=125514&r1=125513&r2=125514&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Checkers/CMakeLists.txt (original)
+++ cfe/trunk/lib/StaticAnalyzer/Checkers/CMakeLists.txt Mon Feb 14 14:14:11 2011
@@ -5,10 +5,6 @@
 add_custom_target(ClangSACheckers
   DEPENDS Checkers.inc)
 
-# So 'Checkers.inc' can be included from the cmake build directory.
-# FIXME: Someone more familiar with cmake should enable this for all of LLVM.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I ${CMAKE_CURRENT_BINARY_DIR}")
-
 set(LLVM_USED_LIBS clangBasic clangAST)
 
 add_clang_library(clangStaticAnalyzerCheckers