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>

CMake: fix astc code not being enabled correctly
ceb6258a · Antonio Maiorano · ff772a7b · ceb6258a · ceb6258a
Commit ceb6258a authored Apr 21, 2020 by Antonio Maiorano
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CMakeLists.txt src/Device/CMakeLists.txt +1 -0

CMakeLists.txt src/Vulkan/CMakeLists.txt +0 -1

No files found.
--- a/src/Device/CMakeLists.txt
+++ b/src/Device/CMakeLists.txt
@@ -76,4 +76,5 @@ target_compile_options(vk_device
 target_link_libraries(vk_device
    PUBLIC
        vk_pipeline
+        $<$<BOOL:${SWIFTSHADER_ENABLE_ASTC}>:astc-encoder>
 )
--- a/src/Vulkan/CMakeLists.txt
+++ b/src/Vulkan/CMakeLists.txt
@@ -180,7 +180,6 @@ target_link_libraries(vk_swiftshader
        ${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})