diff options
| author | Li Peng <peng.li@linux.intel.com> | 2014-06-04 14:21:44 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2014-06-04 12:31:27 +0800 |
| commit | f2479594d4a5f71bd1eb389a4efb70fa132a19d7 (patch) | |
| tree | 4d3038a6e52e632c927d2d52d8f92d44d5856792 | |
| parent | 1edc50b11d75883b6895978a20cc29e117eb3f86 (diff) | |
add DRM_LIBDIR path into link directory list
Then beignet can link to user preferred drm library rather than default
Signed-off-by: Li Peng <peng.li@intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
| -rw-r--r-- | backend/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | benchmark/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utests/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt index 02c64049..67ea371e 100644 --- a/backend/src/CMakeLists.txt +++ b/backend/src/CMakeLists.txt @@ -175,7 +175,7 @@ else (GBE_USE_BLOB) endif (GBE_USE_BLOB) include_directories (.) -link_directories (${LLVM_LIBRARY_DIRS}) +link_directories (${LLVM_LIBRARY_DIRS} ${DRM_LIBDIR}) include_directories(${LLVM_INCLUDE_DIRS}) add_library (gbe SHARED ${GBE_SRC}) @@ -207,7 +207,7 @@ if (LLVM_VERSION_NODOT VERSION_EQUAL 34) endif (${TERMINFO} STREQUAL TERMINFO-NOTFOUND) endif(LLVM_VERSION_NODOT VERSION_EQUAL 34) -link_directories (${LLVM_LIBRARY_DIR}) +link_directories (${LLVM_LIBRARY_DIR} ${DRM_LIBDIR}) ADD_EXECUTABLE(gbe_bin_generater gbe_bin_generater.cpp) TARGET_LINK_LIBRARIES(gbe_bin_generater gbe) diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index fb28023b..d96a2e02 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include) -link_directories (${LLVM_LIBRARY_DIR}) +link_directories (${LLVM_LIBRARY_DIR} ${DRM_LIBDIR}) set (benchmark_sources ../utests/utest_error.c ../utests/utest_assert.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8d35d65..af782785 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -95,7 +95,7 @@ endif (OCLIcd_FOUND) SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic,--allow-shlib-undefined") -link_directories (${LLVM_LIBRARY_DIR}) +link_directories (${LLVM_LIBRARY_DIR} ${DRM_LIBDIR}) add_library(cl SHARED ${OPENCL_SRC}) target_link_libraries( cl diff --git a/utests/CMakeLists.txt b/utests/CMakeLists.txt index 73376fe6..9ad08c9f 100644 --- a/utests/CMakeLists.txt +++ b/utests/CMakeLists.txt @@ -19,7 +19,7 @@ configure_file ( ) #XXX only need GL if required -link_directories (${LLVM_LIBRARY_DIR} ${OPENGL_LIBDIR}) +link_directories (${LLVM_LIBRARY_DIR} ${OPENGL_LIBDIR} ${DRM_LIBDIR}) set (utests_sources utest_error.c compiler_basic_arithmetic.cpp |