Make other_include SYSTEM includes for loadtests

to stop warnings in assimp files.
KhronosGroup · Sep 6, 2023 · 8803430 · 8803430
1 parent 57e714b
commit 8803430
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/tests/loadtests/CMakeLists.txt b/tests/loadtests/CMakeLists.txt
@@ -111,12 +111,17 @@ PUBLIC
  appfwSDL
  $<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
  ${PROJECT_SOURCE_DIR}/lib
- ${PROJECT_SOURCE_DIR}/other_include
  ${PROJECT_SOURCE_DIR}/utils
  common
  geom
 )
 
+target_include_directories(
+ appfwSDL
+SYSTEM PUBLIC
+ ${PROJECT_SOURCE_DIR}/other_include
+)
+
 if(${KTX_FEATURE_LOADTEST_APPS} MATCHES "OpenGL")
  add_library( GLAppSDL STATIC
  appfwSDL/GLAppSDL.cpp
@@ -136,13 +141,18 @@ if(${KTX_FEATURE_LOADTEST_APPS} MATCHES "OpenGL")
  target_include_directories(
  GLAppSDL
  PUBLIC
- ${PROJECT_SOURCE_DIR}/other_include
- appfwSDL
+ $<TARGET_PROPERTY:appfwSDL,INCLUDE_DIRECTORIES>
  common
  glloadtests
  glloadtests/utils
  )
 
+ target_include_directories(
+ GLAppSDL
+ SYSTEM PRIVATE
+ $<TARGET_PROPERTY:appfwSDL,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
+ )
+
  if(OPENGL_FOUND)
  target_include_directories(
  GLAppSDL

diff --git a/tests/loadtests/glloadtests.cmake b/tests/loadtests/glloadtests.cmake
@@ -22,12 +22,17 @@ function( create_gl_target target version sources common_resources test_images
  target_include_directories(
  ${target}
  PRIVATE
- $<TARGET_PROPERTY:appfwSDL,INTERFACE_INCLUDE_DIRECTORIES>
  $<TARGET_PROPERTY:GLAppSDL,INTERFACE_INCLUDE_DIRECTORIES>
  $<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
  $<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
  )
 
+ target_include_directories(
+ ${target}
+ SYSTEM PRIVATE
+ ${PROJECT_SOURCE_DIR}/other_include
+ )
+
  set_target_properties(${target} PROPERTIES
  CXX_VISIBILITY_PRESET ${STATIC_APP_LIB_SYMBOL_VISIBILITY}
  )

diff --git a/tests/loadtests/vkloadtests.cmake b/tests/loadtests/vkloadtests.cmake
@@ -175,6 +175,11 @@ PRIVATE
  vkloadtests/utils
 )
 
+target_include_directories(vkloadtests
+ SYSTEM PRIVATE
+ ${PROJECT_SOURCE_DIR}/other_include
+)
+
 target_link_libraries(vkloadtests
  ktx
  ${KTX_ZLIB_LIBRARIES}