commit 6d8a9c590745cfdbf15379ef75ec8ca56fb327d2
author Antonio Maiorano <amaiorano@google.com> Thu Apr 16 01:18:39 2020 -0400
committer Antonio Maiorano <amaiorano@google.com> Thu Apr 16 16:00:32 2020 +0000
tree eb6fb077f451923ccb2341ebce39fd226d3d61f6
parent d6d5993617f4df4d91feb4a8374c51725548fe15

CMake: fix PowerVR_Examples build

Moved the copy to bin custom command into Vulkan/CMakeLists.txt.
We always copy, just like for the GL targets.

Bug: b/145758253
Change-Id: Idf3af01b453e202610156eff3b302c41fb0ac292
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43974
Tested-by: Antonio Maiorano <amaiorano@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index daea8a5..e131a13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -754,19 +754,6 @@
     set(PVR_BUILD_EXAMPLES TRUE CACHE BOOL "Build the PowerVR SDK Examples" FORCE)
     add_subdirectory(${THIRD_PARTY_DIR}/PowerVR_Examples)
 
-    if(NOT APPLE)
-        # Copy the 'loader' library to the bin/ directory
-        # where the PowerVR executables are placed.
-        if(SWIFTSHADER_BUILD_VULKAN)
-            add_custom_command(
-                TARGET vk_swiftshader
-                POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/bin
-                COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:vk_swiftshader> ${CMAKE_BINARY_DIR}/bin/${VULKAN_API_LIBRARY_NAME}
-            )
-        endif()
-    endif()
-
     # Samples known to work well
     set(PVR_VULKAN_TARGET_GOOD
         VulkanBumpmap

src/Vulkan/CMakeLists.txt

diff --git a/src/Vulkan/CMakeLists.txt b/src/Vulkan/CMakeLists.txt
index b6d4c6d..459ac82 100644
--- a/src/Vulkan/CMakeLists.txt
+++ b/src/Vulkan/CMakeLists.txt
@@ -203,6 +203,10 @@
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}/
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:vk_swiftshader> ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}/
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:vk_swiftshader> ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}/${VULKAN_API_LIBRARY_NAME}
+
+    # Copy to ${CMAKE_BINARY_DIR}/bin so the library sits next to the PVR samples.
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/bin
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:vk_swiftshader> ${CMAKE_BINARY_DIR}/bin/${VULKAN_API_LIBRARY_NAME}
 )
 
 # The vk_swiftshader_icd.json manifest file will point to ICD_LIBRARY_PATH.