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>
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| Version.h | Loading commit data... | |
| VkBuffer.cpp | Loading commit data... | |
| VkBuffer.hpp | Loading commit data... | |
| VkBufferView.hpp | Loading commit data... | |
| VkCommandBuffer.cpp | Loading commit data... | |
| VkCommandBuffer.hpp | Loading commit data... | |
| VkCommandPool.cpp | Loading commit data... | |
| VkCommandPool.hpp | Loading commit data... | |
| VkConfig.h | Loading commit data... | |
| VkDebug.cpp | Loading commit data... | |
| VkDebug.hpp | Loading commit data... | |
| VkDescriptorPool.cpp | Loading commit data... | |
| VkDescriptorPool.hpp | Loading commit data... | |
| VkDescriptorSetLayout.cpp | Loading commit data... | |
| VkDescriptorSetLayout.hpp | Loading commit data... | |
| VkDescriptorUpdateTemplate.cpp | Loading commit data... | |
| VkDescriptorUpdateTemplate.hpp | Loading commit data... | |
| VkDestroy.h | Loading commit data... | |
| VkDevice.cpp | Loading commit data... | |
| VkDevice.hpp | Loading commit data... | |
| VkDeviceMemory.cpp | Loading commit data... | |
| VkDeviceMemory.hpp | Loading commit data... | |
| VkEvent.hpp | Loading commit data... | |
| VkFence.hpp | Loading commit data... | |
| VkFormat.cpp | Loading commit data... | |
| VkFormat.h | Loading commit data... | |
| VkFramebuffer.cpp | Loading commit data... | |
| VkFramebuffer.hpp | Loading commit data... | |
| VkGetProcAddress.cpp | Loading commit data... | |
| VkGetProcAddress.h | Loading commit data... | |
| VkImage.cpp | Loading commit data... | |
| VkImage.hpp | Loading commit data... | |
| VkImageView.cpp | Loading commit data... | |
| VkImageView.hpp | Loading commit data... | |
| VkInstance.cpp | Loading commit data... | |
| VkInstance.hpp | Loading commit data... | |
| VkMemory.cpp | Loading commit data... | |
| VkMemory.h | Loading commit data... | |
| VkObject.hpp | Loading commit data... | |
| VkPhysicalDevice.cpp | Loading commit data... | |
| VkPhysicalDevice.hpp | Loading commit data... | |
| VkPipeline.cpp | Loading commit data... | |
| VkPipeline.hpp | Loading commit data... | |
| VkPipelineCache.hpp | Loading commit data... | |
| VkPipelineLayout.cpp | Loading commit data... | |
| VkPipelineLayout.hpp | Loading commit data... | |
| VkPromotedExtensions.cpp | Loading commit data... | |
| VkQueryPool.cpp | Loading commit data... | |
| VkQueryPool.hpp | Loading commit data... | |
| VkQueue.cpp | Loading commit data... | |
| VkQueue.hpp | Loading commit data... | |
| VkRenderPass.cpp | Loading commit data... | |
| VkRenderPass.hpp | Loading commit data... | |
| VkSampler.hpp | Loading commit data... | |
| VkSemaphore.hpp | Loading commit data... | |
| VkShaderModule.cpp | Loading commit data... | |
| VkShaderModule.hpp | Loading commit data... | |
| Vulkan.rc | Loading commit data... | |
| libVulkan.cpp | Loading commit data... | |
| libvk_swiftshader.lds | Loading commit data... | |
| main.cpp | Loading commit data... | |
| resource.h | Loading commit data... | |
| swiftshader_icd.def | Loading commit data... | |
| vk_swiftshader_icd.json | Loading commit data... | |
| vk_swiftshader_icd.json.tmpl | Loading commit data... | |
| vulkan.vcxproj | Loading commit data... | |
| vulkan.vcxproj.filters | Loading commit data... |