commit f6fdcb1114f08c7953005ea2627d809bc9b50070
author dan sinclair <dj2@everburning.com> Fri Oct 23 17:04:10 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Oct 23 17:04:10 2020 +0000
tree b957018a9e82420b99d20d117967d0040b404182
parent 1b1d2a59074463a1635f37eb07b65fa846682e21

Set target defines PUBLIC.

This CL sets the target defines as PUBLIC so downstream CMakeFiles can
correctly setup the defines when including the tint headers

Change-Id: Idcb38761ed73ecda652945287ff096a11e7b2b01
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/30840
Commit-Queue: David Neto <dneto@google.com>
Reviewed-by: David Neto <dneto@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c08814..528671b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,9 +73,6 @@
   include_directories("${PROJECT_SOURCE_DIR}/third_party/spirv-tools/include")
 endif()
 
-include_directories("${PROJECT_SOURCE_DIR}/third_party/spirv-headers/include")
-include_directories("${PROJECT_SOURCE_DIR}/include")
-
 if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR
     ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") OR
     (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND
@@ -116,19 +113,25 @@
 endif()
 
 function(tint_default_compile_options TARGET)
-  include_directories("${PROJECT_SOURCE_DIR}")
+  target_include_directories(${TARGET} PUBLIC "${PROJECT_SOURCE_DIR}")
+  target_include_directories(${TARGET} PUBLIC "${PROJECT_SOURCE_DIR}/include")
 
-  target_compile_definitions(${TARGET} PRIVATE
+  if (${TINT_BUILD_SPV_READER} OR ${TINT_BUILD_SPV_WRITER})
+    target_include_directories(${TARGET} PUBLIC
+        "${PROJECT_SOURCE_DIR}/third_party/spirv-headers/include")
+  endif()
+
+  target_compile_definitions(${TARGET} PUBLIC
       -DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>)
-  target_compile_definitions(${TARGET} PRIVATE
+  target_compile_definitions(${TARGET} PUBLIC
       -DTINT_BUILD_WGSL_READER=$<BOOL:${TINT_BUILD_WGSL_READER}>)
-  target_compile_definitions(${TARGET} PRIVATE
+  target_compile_definitions(${TARGET} PUBLIC
       -DTINT_BUILD_HLSL_WRITER=$<BOOL:${TINT_BUILD_HLSL_WRITER}>)
-  target_compile_definitions(${TARGET} PRIVATE
+  target_compile_definitions(${TARGET} PUBLIC
     -DTINT_BUILD_MSL_WRITER=$<BOOL:${TINT_BUILD_MSL_WRITER}>)
-  target_compile_definitions(${TARGET} PRIVATE
+  target_compile_definitions(${TARGET} PUBLIC
       -DTINT_BUILD_SPV_WRITER=$<BOOL:${TINT_BUILD_SPV_WRITER}>)
-  target_compile_definitions(${TARGET} PRIVATE
+  target_compile_definitions(${TARGET} PUBLIC
       -DTINT_BUILD_WGSL_WRITER=$<BOOL:${TINT_BUILD_WGSL_WRITER}>)
 
   if (${COMPILER_IS_LIKE_GNU})