KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "meson: try to use cmake as a finder for clang" 

This reverts commit 0ba0c0c15c.
This commit is contained in:
Dylan Baker 2019-06-28 16:36:27 -07:00
parent 78aa4a3c0a
commit 69f9fbab8a
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/gallium/targets/opencl/meson.build
View File

@ -1,4 +1,4 @@
# Copyright © 2017-2019 Intel Corporation
# Copyright © 2017 Intel Corporation
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@ -29,33 +29,10 @@ if with_ld_version_script
opencl_link_deps += files('opencl.sym')
endif
_clang_modules = [
'clangCodeGen',
'clangFrontendTool',
'clangFrontend',
'clangDriver',
'clangSerialization',
'clangParse',
'clangSema',
'clangAnalysis',
'clangAST',
'clangEdit',
'clangLex',
'clangBasic',
]
dep_clang = null_dep
if meson.version().version_compare('>=0.51')
dep_clang = dependency('Clang', modules : _clang_modules, required : false)
_llvm_libdir = dep_llvm.get_variable(configtool : 'libdir', cmake : 'LLVM_LIBRARY_DIR')
llvm_libdir = dep_llvm.get_variable(configtool : 'libdir', cmake : 'LLVM_LIBRARY_DIR')
else
_llvm_libdir = dep_llvm.get_configtool_variable('libdir')
endif
if not dep_clang.found()
dep_clang = []
foreach m : _clang_modules
dep_clang += cpp.find_library(m, dirs : _llvm_libdir)
endforeach
llvm_libdir = dep_llvm.get_configtool_variable('libdir')
endif
opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL'
@ -68,7 +45,19 @@ libopencl = shared_library(
link_whole : libclover,
link_with : [libpipe_loader_dynamic, libgallium, libmesa_util],
dependencies : [
dep_thread, dep_clock, dep_dl, dep_unwind, dep_elf, dep_expat, dep_clang,
dep_thread, dep_clock, dep_dl, dep_unwind, dep_elf, dep_expat,
cpp.find_library('clangCodeGen', dirs : llvm_libdir),
cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
cpp.find_library('clangFrontend', dirs : llvm_libdir),
cpp.find_library('clangDriver', dirs : llvm_libdir),
cpp.find_library('clangSerialization', dirs : llvm_libdir),
cpp.find_library('clangParse', dirs : llvm_libdir),
cpp.find_library('clangSema', dirs : llvm_libdir),
cpp.find_library('clangAnalysis', dirs : llvm_libdir),
cpp.find_library('clangAST', dirs : llvm_libdir),
cpp.find_library('clangEdit', dirs : llvm_libdir),
cpp.find_library('clangLex', dirs : llvm_libdir),
cpp.find_library('clangBasic', dirs : llvm_libdir),
],
version : '@0@.0.0'.format(opencl_version),
install : true,