CMake: Fix linux build with SWIFTSHADER_BUILD_PVR

The targets `libGLESv2` and `libEGL` are no longer public to the root cmake list. Just move these copy ops into the subdirectory cmake rules without the PVR condition - the copy is cheap enough to do whether we're building PVR or not. Bug: b/145758253 Change-Id: Ic28331e3797c78e4910332fce934c06c132c3aa8 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43710 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Antonio Maiorano <amaiorano@google.com> Tested-by: Ben Clayton <bclayton@google.com>

CMake: Fix linux build with SWIFTSHADER_BUILD_PVR
491555c2 · Ben Clayton · 6480643d · 491555c2 · 491555c2 · 491555c2
Commit 491555c2 authored Apr 09, 2020 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 16 deletions

CMakeLists.txt CMakeLists.txt +8 -15

CMakeLists.txt src/OpenGL/libEGL/CMakeLists.txt +4 -0

CMakeLists.txt src/OpenGL/libGLESv2/CMakeLists.txt +6 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1093,21 +1093,14 @@ if(HAVE_PVR_SUBMODULE AND SWIFTSHADER_BUILD_PVR)
    if(NOT APPLE)
        # Copy the 'loader' library to the bin/ directory
        # where the PowerVR executables are placed.
-        add_custom_command(
+        if(SWIFTSHADER_BUILD_VULKAN)
-            TARGET vk_swiftshader
+            add_custom_command(
-            POST_BUILD
+                TARGET vk_swiftshader
-            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:vk_swiftshader> ${CMAKE_BINARY_DIR}/bin/${VULKAN_API_LIBRARY_NAME}
+                POST_BUILD
-        )
+                COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/bin
-        add_custom_command(
+                COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:vk_swiftshader> ${CMAKE_BINARY_DIR}/bin/${VULKAN_API_LIBRARY_NAME}
-            TARGET libGLESv2
+            )
-            POST_BUILD
+        endif()
-            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libGLESv2> ${CMAKE_BINARY_DIR}/bin/$<TARGET_FILE_NAME:libGLESv2>
-        )
-        add_custom_command(
-            TARGET libEGL
-            POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libEGL> ${CMAKE_BINARY_DIR}/bin/$<TARGET_FILE_NAME:libEGL>
-        )
    endif()
    # Samples known to work well

--- a/src/OpenGL/libEGL/CMakeLists.txt
+++ b/src/OpenGL/libEGL/CMakeLists.txt
@@ -115,4 +115,8 @@ add_custom_command(
    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libEGL> $<TARGET_FILE_DIR:libEGL>/translator/${LIB_PREFIX}EGL_translator${CMAKE_SHARED_LIBRARY_SUFFIX}
    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}/
    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libEGL> ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_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:libEGL> ${CMAKE_BINARY_DIR}/bin/$<TARGET_FILE_NAME:libEGL>
 )
--- a/src/OpenGL/libGLESv2/CMakeLists.txt
+++ b/src/OpenGL/libGLESv2/CMakeLists.txt
@@ -133,4 +133,8 @@ add_custom_command(
    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libGLESv2> $<TARGET_FILE_DIR:libGLESv2>/translator/${LIB_PREFIX}GLES_V2_translator${CMAKE_SHARED_LIBRARY_SUFFIX}
    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}/
    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libGLESv2> ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_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:libGLESv2> ${CMAKE_BINARY_DIR}/bin/$<TARGET_FILE_NAME:libGLESv2>
+)
\ No newline at end of file