Skip to content

S
swiftshader
Commit 6cbb02e0 by Ben Clayton
Options

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: 's avatarBen Clayton <bclayton@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent a0453d55
Showing with 0 additions and 2 deletions
CMakeLists.txt
...@@ -333,7 +333,6 @@ set(LLVM_CONFIG_DIR ${THIRD_PARTY_DIR}/llvm-7.0/configs) ...@@ -333,7 +333,6 @@ set(LLVM_CONFIG_DIR ${THIRD_PARTY_DIR}/llvm-7.0/configs)
set(LIBBACKTRACE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src) set(LIBBACKTRACE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src)
set(LIBBACKTRACE_CONFIG_DIR ${THIRD_PARTY_DIR}/libbacktrace/config) set(LIBBACKTRACE_CONFIG_DIR ${THIRD_PARTY_DIR}/libbacktrace/config)
set(LIBBACKTRACE_INCLUDE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src) 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_DIR ${THIRD_PARTY_DIR}/cppdap)
set(CPPDAP_INCLUDE_DIR ${CPPDAP_DIR}/include) set(CPPDAP_INCLUDE_DIR ${CPPDAP_DIR}/include)
set(JSON_INCLUDE_DIR ${THIRD_PARTY_DIR}/json/include) set(JSON_INCLUDE_DIR ${THIRD_PARTY_DIR}/json/include)
...@@ -1690,7 +1689,6 @@ set(OPENGL_INCLUDE_DIR ...@@ -1690,7 +1689,6 @@ set(OPENGL_INCLUDE_DIR
set(VULKAN_INCLUDE_DIR set(VULKAN_INCLUDE_DIR
${COMMON_INCLUDE_DIR} ${COMMON_INCLUDE_DIR}
${MARL_INCLUDE_DIR}
${CPPDAP_INCLUDE_DIR} ${CPPDAP_INCLUDE_DIR}
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment