diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2011-03-17 19:03:04 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2011-03-17 19:03:04 +0000 |
| commit | 73963b67c1b59135116516b45bc835db997d5537 (patch) | |
| tree | caba1dfc636748f3fa8f3bc5ea3a96b7a9d9a046 | |
| parent | 6120962d7de33a41505796fc126ab61f6d03fcfb (diff) | |
| download | bcm5719-llvm-73963b67c1b59135116516b45bc835db997d5537.tar.gz bcm5719-llvm-73963b67c1b59135116516b45bc835db997d5537.zip | |
Fix some issues with include directories: remove a duplicate and put
Clang binary and source directories first (on that order).
llvm-svn: 127822
| -rw-r--r-- | clang/CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 6fa01d4ee11..6ebe3c4f602 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -40,9 +40,6 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_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}") - endif() link_directories("${PATH_TO_LLVM_BUILD}/lib") set(LLVM_TABLEGEN_EXE "${PATH_TO_LLVM_BUILD}/bin/tblgen") @@ -211,9 +208,9 @@ macro(add_clang_executable name) 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/ |
