diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2014-04-10 18:09:44 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2014-04-17 10:04:36 +0800 |
| commit | cecd52124bfd7c79108e36cae549354b16c2ef4e (patch) | |
| tree | 8b2bae2b7500e393edd8640671b96bed45bb4f2a /utests | |
| parent | 94ee7a3de83c2471a09be83bc860ce3763ce73a2 (diff) | |
| download | beignet-cecd52124bfd7c79108e36cae549354b16c2ef4e.tar.gz | |
Use pkg-config to check modules
Instead of use pre-defined path for dependent modules, e.g libdrm,
libdrm_intel, etc. Use pkg-config helper for cmake instead. This makes
it easy to work with developer own built version of those dependences.
Also remove libGL dependence for 'gbe_bin_generator' which is not required.
libutest.so still requires libGL now but might be fixed by checking real
GL dependence.
v2: Fix build with mesa source (92e6260) and link required EGL lib with utests too.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Reviewed-by：Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'utests')
| -rw-r--r-- | utests/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/utests/CMakeLists.txt b/utests/CMakeLists.txt index 9ca9c8be..aa7efa68 100644 --- a/utests/CMakeLists.txt +++ b/utests/CMakeLists.txt @@ -18,7 +18,8 @@ configure_file ( "setenv.sh" ) -link_directories (${LLVM_LIBRARY_DIR}) +#XXX only need GL if required +link_directories (${LLVM_LIBRARY_DIR} ${OPENGL_LIBDIR}) set (utests_sources utest_error.c compiler_basic_arithmetic.cpp @@ -202,11 +203,14 @@ if (EGL_FOUND AND MESA_SOURCE_FOUND) SET(utests_sources ${utests_sources} compiler_fill_gl_image.cpp) SET(CMAKE_CXX_FLAGS "-DHAS_EGL ${CMAKE_CXX_FLAGS} ${DEF_OCL_PCH_PCM_PATH}") SET(CMAKE_C_FLAGS "-DHAS_EGL ${CMAKE_C_FLAGS} ${DEF_OCL_PCH_PCM_PATH}") -endif (EGL_FOUND AND MESA_SOURCE_FOUND) +SET(UTESTS_REQUIRED_EGL_LIB ${EGL_LIBRARIES}) +else() +SET(UTESTS_REQUIRED_EGL_LIB "") +endif() ADD_LIBRARY(utests SHARED ${ADDMATHFUNC} ${utests_sources}) -TARGET_LINK_LIBRARIES(utests cl m ${OPENGL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +TARGET_LINK_LIBRARIES(utests cl m ${OPENGL_LIBRARIES} ${UTESTS_REQUIRED_EGL_LIB} ${CMAKE_THREAD_LIBS_INIT}) ADD_EXECUTABLE(utest_run utest_run.cpp) TARGET_LINK_LIBRARIES(utest_run utests) |