diff options
| author | Denis Steckelmacher <steckdenis@yahoo.fr> | 2011-08-16 20:29:18 +0200 |
|---|---|---|
| committer | Denis Steckelmacher <steckdenis@yahoo.fr> | 2011-08-16 20:29:18 +0200 |
| commit | c6e634315bef63b7eb7e026947fba7f330ac1946 (patch) | |
| tree | a99b75ae1dcae8555a64ada4c9282321f4bad786 | |
| parent | 5fd01c207793c9f3c3d7952e7c19c03c35f409b5 (diff) | |
Fix problems pointed out by J-P on Wordpress.
| -rw-r--r-- | cmake/modules/FindClang.cmake | 8 | ||||
| -rw-r--r-- | src/core/program.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmake/modules/FindClang.cmake b/cmake/modules/FindClang.cmake index b740937..5f7813c 100644 --- a/cmake/modules/FindClang.cmake +++ b/cmake/modules/FindClang.cmake @@ -13,19 +13,19 @@ ENDMACRO(FIND_AND_ADD_CLANG_LIB) 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(clang) +FIND_AND_ADD_CLANG_LIB(clangFrontendTool) FIND_AND_ADD_CLANG_LIB(clangFrontend) FIND_AND_ADD_CLANG_LIB(clangDriver) +FIND_AND_ADD_CLANG_LIB(clangSerialization) FIND_AND_ADD_CLANG_LIB(clangCodeGen) +FIND_AND_ADD_CLANG_LIB(clangParse) FIND_AND_ADD_CLANG_LIB(clangSema) -FIND_AND_ADD_CLANG_LIB(clangChecker) FIND_AND_ADD_CLANG_LIB(clangAnalysis) +FIND_AND_ADD_CLANG_LIB(clangIndex) FIND_AND_ADD_CLANG_LIB(clangRewrite) FIND_AND_ADD_CLANG_LIB(clangAST) -FIND_AND_ADD_CLANG_LIB(clangParse) FIND_AND_ADD_CLANG_LIB(clangLex) FIND_AND_ADD_CLANG_LIB(clangBasic) -FIND_AND_ADD_CLANG_LIB(clangSerialization) MESSAGE(STATUS "Clang libs: " ${CLANG_LIBS}) diff --git a/src/core/program.cpp b/src/core/program.cpp index eeb5f48..5b55a3b 100644 --- a/src/core/program.cpp +++ b/src/core/program.cpp @@ -311,7 +311,7 @@ cl_int Program::build(const char *options, s_name); // Compile - if (!dep.compiler->compile(options, buffer)) + if (!dep.compiler->compile(options ? options : std::string(), buffer)) { if (pfn_notify) pfn_notify((cl_program)this, user_data); |