From b16eb592cc31b7cc9ba3d2f9525486c282996a9e Mon Sep 17 00:00:00 2001 From: Lujin Wang <143145775+lujinwangnv@users.noreply.github.com> Date: Fri, 30 May 2025 12:52:55 -0700 Subject: Change SLANG_OVERRIDE_xxx_PATH and fix header file path (#7207) * Fix lua header file path Add two missed files in #7167 * Fix lua header file path Add two missed files in #7167 * Leave lua/ in the path to avoid name conflict * Remove xxx from path of SLANG_OVERRIDE_xxx_PATH Change SLANG_OVERRIDE_xxx_PATH from path-to-parent-folder/xxx to path-to-parent-folder and add "xxx/" back to "#include", which helps to avoid the potential name conflict of external tools. * format code --------- Co-authored-by: Yong He Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- tools/CMakeLists.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'tools/CMakeLists.txt') diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index aad87e21d..6ca35b8b0 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -51,7 +51,7 @@ if(NOT SLANG_OVERRIDE_LUA_PATH) LINK_WITH_PRIVATE compiler-core INCLUDE_DIRECTORIES_PUBLIC - ${slang_SOURCE_DIR}/external/lua + ${slang_SOURCE_DIR}/external ) else() generator( @@ -182,34 +182,28 @@ if(SLANG_ENABLE_GFX) ${slang_SOURCE_DIR}/include if (not ${SLANG_OVERRIDE_SPIRV_TOOLS_PATH}) - INCLUDE_DIRECTORIES_PUBLIC - ${slang_SOURCE_DIR}/external/spirv-tools - else - () + INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/external else () INCLUDE_DIRECTORIES_PUBLIC ${SLANG_OVERRIDE_SPIRV_TOOLS_PATH} endif () if (not ${SLANG_OVERRIDE_GLM_PATH}) - INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/external/glm else () + INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/external else () INCLUDE_DIRECTORIES_PUBLIC ${SLANG_OVERRIDE_GLM_PATH} endif () if (not ${SLANG_OVERRIDE_IMGUI_PATH}) - INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/external/imgui else () + INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/external else () INCLUDE_DIRECTORIES_PUBLIC ${SLANG_OVERRIDE_IMGUI_PATH} endif () if (not ${SLANG_OVERRIDE_TINYOBJLOADER_PATH}) - INCLUDE_DIRECTORIES_PUBLIC - ${slang_SOURCE_DIR}/external/tinyobjloader - else - () + INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/external else () INCLUDE_DIRECTORIES_PUBLIC ${SLANG_OVERRIDE_TINYOBJLOADER_PATH} endif () INCLUDE_DIRECTORIES_PRIVATE ${NVAPI_INCLUDE_DIRS} INSTALL -- cgit v1.2.3