diff options
| author | Piotr Rak <piotr.rak@gmail.com> | 2010-11-21 04:45:41 +0100 |
|---|---|---|
| committer | Zack Rusin <zack@kde.org> | 2010-11-22 19:52:09 -0500 |
| commit | 1e018dfcec6e19e48dea6c185fd1e69da21dcc74 (patch) | |
| tree | 4d87e2fba0da67531f331903dcd58cffa8049330 | |
| parent | b3a2e1ab965180d07fc75000a9a40d1b90740621 (diff) | |
Build fixes for llvm-libdir != /usr/lib.
Add LLVM_LDFLAGS to clcompiler.
Prevent from pulling as dependancy already linked to libOpenCL
static libraries (fixes examples/trivial/basic).
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/tools/CMakeLists.txt | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0c011e3..fe22d39 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,8 +40,9 @@ SET_TARGET_PROPERTIES(OpenCL PROPERTIES set_source_files_properties( ${COAL_SRC_FILES} PROPERTIES COMPILE_FLAGS ${LLVM_COMPILE_FLAGS}) -set_target_properties(OpenCL - PROPERTIES LINK_FLAGS ${LLVM_LDFLAGS}) +set_target_properties(OpenCL PROPERTIES + LINK_FLAGS ${LLVM_LDFLAGS} + LINK_INTERFACE_LIBRARIES "") TARGET_LINK_LIBRARIES(OpenCL diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index ca88e2e..2895f29 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -16,5 +16,8 @@ set_source_files_properties( ${COMPILER_SRC_FILES} add_executable(clcompiler ${COMPILER_SRC_FILES} ${Coal_SOURCE_DIR}/src/compiler) +set_target_properties(clcompiler + PROPERTIES LINK_FLAGS ${LLVM_LDFLAGS}) + target_link_libraries(clcompiler OpenCL ${CLANG_LIBS} ${LLVM_LIBS_CORE}) |