commit 0adcf0443318c5c8873e2c30cd6bb1fa2eedaebc
author Nicolas Capens <capn@google.com> Sun Feb 06 08:17:42 2022 -0500
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Feb 07 15:05:12 2022 +0000
tree f0360ef67db4a22c93ad8f92735c463fd242b9e6
parent d57e6c7a89a5f70738964fb381e0ab8ef3181217

Make the Reactor build target an alias

Previously the Cmake Reactor variable was a symbol to either ReactorLLVM
or ReactorSubzero, requiring the ${Reactor} syntax to dereference it.
This change uses CMake's ability to create new build targets which are
aliases of existing targets:
https://cmake.org/cmake/help/latest/command/add_library.html#alias-libraries

Bug: b/145758253
Change-Id: I5734548668114b1b22a851167913a448d83eabda
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/62328
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Commit-Queue: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4600d3b..4010b79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -743,9 +743,9 @@
 add_subdirectory(src/Reactor) # Add ReactorSubzero and ReactorLLVM targets
 
 if(${REACTOR_BACKEND} STREQUAL "LLVM")
-    set(Reactor ReactorLLVM)
+    add_library(Reactor ALIAS ReactorLLVM)
 elseif(${REACTOR_BACKEND} STREQUAL "Subzero")
-    set(Reactor ReactorSubzero)
+    add_library(Reactor ALIAS ReactorSubzero)
 else()
     message(FATAL_ERROR "REACTOR_BACKEND must be 'LLVM' or 'Subzero'")
 endif()

src/Vulkan/CMakeLists.txt

diff --git a/src/Vulkan/CMakeLists.txt b/src/Vulkan/CMakeLists.txt
index 159f3b5..121092e 100644
--- a/src/Vulkan/CMakeLists.txt
+++ b/src/Vulkan/CMakeLists.txt
@@ -193,7 +193,7 @@
         vk_pipeline
         vk_device
         vk_wsi
-        ${Reactor}
+        Reactor
         marl
         ${OS_LIBS}
         ${SWIFTSHADER_LIBS}

tests/ReactorBenchmarks/CMakeLists.txt

diff --git a/tests/ReactorBenchmarks/CMakeLists.txt b/tests/ReactorBenchmarks/CMakeLists.txt
index 5f85e3f..04003da 100644
--- a/tests/ReactorBenchmarks/CMakeLists.txt
+++ b/tests/ReactorBenchmarks/CMakeLists.txt
@@ -49,6 +49,6 @@
     PRIVATE
         benchmark::benchmark
         marl
-        ${Reactor}
+        Reactor
         ${ROOT_PROJECT_LINK_LIBRARIES}
 )

tests/ReactorUnitTests/CMakeLists.txt

diff --git a/tests/ReactorUnitTests/CMakeLists.txt b/tests/ReactorUnitTests/CMakeLists.txt
index 0b98072..e3c3ff3 100644
--- a/tests/ReactorUnitTests/CMakeLists.txt
+++ b/tests/ReactorUnitTests/CMakeLists.txt
@@ -53,7 +53,7 @@
 
 target_link_libraries(ReactorUnitTests
     PRIVATE
-        ${Reactor}
+        Reactor
         gtest
         ${ROOT_PROJECT_LINK_LIBRARIES}
 )