commit 6cbb02e0dc934ac1e21b182f0f632b4e806449a6
author Ben Clayton <bclayton@google.com> Fri Feb 07 16:37:56 2020 +0000
committer Ben Clayton <bclayton@google.com> Tue Feb 11 19:13:55 2020 +0000
tree d8104565950dc7f14d3a0860751ccac9014c50d4
parent a0453d55f721e528656a41742f28e0882863e1bb

CMakeLists: Drop the explicit include path to marl

Marl now exposes this as PUBLIC on the target, so it is automatically and implicitly included.

Bug: b/140546382
Change-Id: I9ed331559c7b5cccad3065b4fadeca8380d6e910
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/40973
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02f903c..0ff9cd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -333,7 +333,6 @@
 set(LIBBACKTRACE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src)
 set(LIBBACKTRACE_CONFIG_DIR ${THIRD_PARTY_DIR}/libbacktrace/config)
 set(LIBBACKTRACE_INCLUDE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src)
-set(MARL_INCLUDE_DIR ${THIRD_PARTY_DIR}/marl/include)
 set(CPPDAP_DIR ${THIRD_PARTY_DIR}/cppdap)
 set(CPPDAP_INCLUDE_DIR ${CPPDAP_DIR}/include)
 set(JSON_INCLUDE_DIR ${THIRD_PARTY_DIR}/json/include)
@@ -1690,7 +1689,6 @@
 
 set(VULKAN_INCLUDE_DIR
     ${COMMON_INCLUDE_DIR}
-    ${MARL_INCLUDE_DIR}
     ${CPPDAP_INCLUDE_DIR}
 )