[cfe-commits] r127822 - /cfe/trunk/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Thu Mar 17 14:03:04 2011
New Revision: 127822

URL: http://llvm.org/viewvc/llvm-project?rev=127822&view=rev
Log:
Fix some issues with include directories: remove a duplicate and put
Clang binary and source directories first (on that order).

Modified:
    cfe/trunk/CMakeLists.txt

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=127822&r1=127821&r2=127822&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Thu Mar 17 14:03:04 2011
@@ -40,9 +40,6 @@
 
   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}")
-  endif()
   link_directories("${PATH_TO_LLVM_BUILD}/lib")
 
   set(LLVM_TABLEGEN_EXE "${PATH_TO_LLVM_BUILD}/bin/tblgen")
@@ -211,9 +208,9 @@
   set_target_properties(${name} PROPERTIES FOLDER "Clang executables")
 endmacro(add_clang_executable)
 
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
+include_directories(BEFORE
   ${CMAKE_CURRENT_BINARY_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
   )
 
 install(DIRECTORY include/