encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: use `TINT_THIRD_PARTY_DIR` 

Instead of '${TINT_ROOT_SOURCE_DIR}/third_party'

Fixed: tint:1435
Change-Id: I80622f490326ccba4580021dfe2b355a7586e307
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/80760
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Ben Clayton 2022-02-18 14:26:49 +00:00 committed by Tint LUCI CQ
parent 25c6505a64
commit 16446e5b74
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -198,7 +198,7 @@ if (${TINT_CHECK_CHROMIUM_STYLE})
endif() endif()
if (${TINT_BUILD_SPV_READER}) if (${TINT_BUILD_SPV_READER})
include_directories("${TINT_ROOT_SOURCE_DIR}/third_party/spirv-tools/include") include_directories("${TINT_THIRD_PARTY_DIR}/spirv-tools/include")
endif() endif()
if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")) if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC"))
@ -262,7 +262,7 @@ function(tint_core_compile_options TARGET)
if (${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER}) if (${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER})
target_include_directories(${TARGET} PUBLIC target_include_directories(${TARGET} PUBLIC
"${TINT_ROOT_SOURCE_DIR}/third_party/spirv-headers/include") "${TINT_THIRD_PARTY_DIR}/spirv-headers/include")
endif() endif()
target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>) target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>)