commit ceb6258ae1016ebaffb7036561e0cba14c8cc2a7
author Antonio Maiorano <amaiorano@google.com> Tue Apr 21 13:25:10 2020 -0400
committer Antonio Maiorano <amaiorano@google.com> Tue Apr 21 18:43:15 2020 +0000
tree 928122c8122c6faa59e4b649224329530046de74
parent ff772a7bcc9872e034210ad226ea9f94556a3dc8

CMake: fix astc code not being enabled correctly

In my refactoring of the astc-encoder (https://swiftshader-review.googlesource.com/c/SwiftShader/+/43269),
I had incorrectly set the dependency on astc-encoder in the Vulkan
module, rather than Device. Vulkan depends on Device, and we make use of
astc-encoder public macros in both modules. Thanks to bclayton@ for
finding and reporting this problem.

Fixes: b/154593186
Fixes: b/154593187
Fixes: b/154589883
Fixes: b/154591494
Fixes: b/154591735
Fixes: b/154593191
Fixes: b/154591498
Fixes: b/154593113
Change-Id: I8a71a6471ef85783110afb4f034a611116892b05
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/44148
Presubmit-Ready: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>

src/Device/CMakeLists.txt

diff --git a/src/Device/CMakeLists.txt b/src/Device/CMakeLists.txt
index a0c72f4..3752b1f 100644
--- a/src/Device/CMakeLists.txt
+++ b/src/Device/CMakeLists.txt
@@ -76,4 +76,5 @@
 target_link_libraries(vk_device
     PUBLIC
         vk_pipeline
+        $<$<BOOL:${SWIFTSHADER_ENABLE_ASTC}>:astc-encoder>
 )

src/Vulkan/CMakeLists.txt

diff --git a/src/Vulkan/CMakeLists.txt b/src/Vulkan/CMakeLists.txt
index 459ac82..3ff6ec5 100644
--- a/src/Vulkan/CMakeLists.txt
+++ b/src/Vulkan/CMakeLists.txt
@@ -180,7 +180,6 @@
         ${OS_LIBS}
         ${SWIFTSHADER_LIBS}
         $<$<BOOL:${SWIFTSHADER_ENABLE_VULKAN_DEBUGGER}>:cppdap>
-        $<$<BOOL:${SWIFTSHADER_ENABLE_ASTC}>:astc-encoder>
 )
 
 set_shared_library_export_map(vk_swiftshader ${CMAKE_CURRENT_SOURCE_DIR})