diff options
| author | Zack Rusin <zack@kde.org> | 2010-03-27 23:38:25 -0400 |
|---|---|---|
| committer | Zack Rusin <zack@kde.org> | 2010-03-27 23:38:25 -0400 |
| commit | 70defc70d223ebc27da5d1c07f457e2920e7fa33 (patch) | |
| tree | 96c6f0df9cc0a4f3c9118827ebdcc08e889eaa52 /cmake | |
| parent | a1b6c6bf448a6dbe2f1b668f319a251c0af57573 (diff) | |
Lots of various changes
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindClang.cmake | 18 | ||||
| -rw-r--r-- | cmake/modules/FindGallium.cmake | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/cmake/modules/FindClang.cmake b/cmake/modules/FindClang.cmake index e46de74..b5c1953 100644 --- a/cmake/modules/FindClang.cmake +++ b/cmake/modules/FindClang.cmake @@ -1,23 +1,25 @@ # Detect CLANG -if (NOT CLANG_SRC_DIR OR NOT CLANG_BUILD_DIR) - message(FATAL_ERROR "Define CLANG_SRC_DIR and CLANG_BUILD_DIR to build Clover") -else (NOT CLANG_SRC_DIR OR NOT CLANG_BUILD_DIR) +if (NOT LLVM_INCLUDE_DIR OR NOT LLVM_LIB_DIR) + message(FATAL_ERROR "No LLVM and Clang support requires LLVM") +else (NOT LLVM_INCLUDE_DIR OR NOT LLVM_LIB_DIR) MACRO(FIND_AND_ADD_CLANG_LIB _libname_) -find_library(CLANG_${_libname_}_LIB ${_libname_} ${CLANG_SRC_DIR}/Debug/lib ${CLANG_BUILD_DIR}/Debug/lib) +find_library(CLANG_${_libname_}_LIB ${_libname_} ${LLVM_LIB_DIR} ${CLANG_LIB_DIR}) if (CLANG_${_libname_}_LIB) set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_libname_}_LIB}) endif(CLANG_${_libname_}_LIB) ENDMACRO(FIND_AND_ADD_CLANG_LIB) -set(CLANG_INCLUDE_DIRS ${CLANG_INCLUDE_DIRS} ${CLANG_SRC_DIR}/tools/clang/include) -set(CLANG_INCLUDE_DIRS ${CLANG_INCLUDE_DIRS} ${CLANG_BUILD_DIR}/tools/clang/include) +set(CLANG_INCLUDE_DIRS ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIR}) +set(CLANG_INCLUDE_DIRS ${CLANG_INCLUDE_DIRS} ${CLANG_INCLUDE_DIR}) FIND_AND_ADD_CLANG_LIB(clangFrontend) +FIND_AND_ADD_CLANG_LIB(clangDriver) FIND_AND_ADD_CLANG_LIB(clangCodeGen) +FIND_AND_ADD_CLANG_LIB(clangSema) +FIND_AND_ADD_CLANG_LIB(clangChecker) FIND_AND_ADD_CLANG_LIB(clangAnalysis) FIND_AND_ADD_CLANG_LIB(clangRewrite) -FIND_AND_ADD_CLANG_LIB(clangSema) FIND_AND_ADD_CLANG_LIB(clangAST) FIND_AND_ADD_CLANG_LIB(clangParse) FIND_AND_ADD_CLANG_LIB(clangLex) @@ -37,4 +39,4 @@ else(CLANG_FOUND) endif(CLANG_FIND_REQUIRED) endif(CLANG_FOUND) -endif (NOT CLANG_SRC_DIR OR NOT CLANG_BUILD_DIR) +endif (NOT LLVM_INCLUDE_DIR OR NOT LLVM_LIB_DIR) diff --git a/cmake/modules/FindGallium.cmake b/cmake/modules/FindGallium.cmake index 5449f65..2d59d99 100644 --- a/cmake/modules/FindGallium.cmake +++ b/cmake/modules/FindGallium.cmake @@ -1,6 +1,6 @@ # Detect Gallium if (NOT GALLIUM_DIR) - message(FATAL_ERROR "Define GALLIUM_DIR to build Clover") + message(FATAL_ERROR "Define GALLIUM_DIR to build Coal") else (NOT GALLIUM_DIR) MACRO(FIND_AND_ADD_GALLIUM_LIB _libname_) |