OSDN Git Service

Copy build artifacts to CMAKE_BINARY_DIR.
authorDan Sinclair <dsinclair@google.com>
Thu, 14 Mar 2019 14:51:05 +0000 (10:51 -0400)
committerDan Sinclair <dsinclair@google.com>
Fri, 15 Mar 2019 00:34:59 +0000 (00:34 +0000)
commit1b8cd2d9ce2c0c0cc0213da6eab7d8d47bef4ab3
treec5dfee94a2b22b7f9d45683168c2039825e474c3
parent9b156615197ddcc0b2afd550521db538e6df90e5
Copy build artifacts to CMAKE_BINARY_DIR.

Currently when the build executes it copies things like .so files and
the vulkan .icd file to the CMAKE_CURRENT_SOURCE_DIR/out/<platform>
directory. This is fine in a normal swiftshader build but if you embed
swiftshader into another project this ends up being something like:
third_party/swiftshader/out/<platform> which is not what is desired.

This CL changes the files to get written to the CMAKE_BINARY_DIR. This
means it will go into the directory form which cmake was run. This means
for a build setup as per the README, build/<platform>.

This also allows generating different .icd and .so files for Release and
Debug if you setup different build directories.

Bug: b/123752208
Change-Id: If2e8c70ca2d35351c02f7bbe56ff77a04d538373
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27188
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
CMakeLists.txt
docs/dEQP.md
src/Vulkan/vk_swiftshader_icd.json.tmpl
tests/VulkanUnitTests/Driver.cpp