diff options
| author | Lujin Wang <143145775+lujinwangnv@users.noreply.github.com> | 2025-05-30 12:52:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-30 19:52:55 +0000 |
| commit | b16eb592cc31b7cc9ba3d2f9525486c282996a9e (patch) | |
| tree | b7916c5dbbb27ffbe330a783ed1dcc0fd9bc4b3b /tools/CMakeLists.txt | |
| parent | ec7ab914f79978b8980c7797e20d3399604b1f86 (diff) | |
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 <yonghe@outlook.com>
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'tools/CMakeLists.txt')
| -rw-r--r-- | tools/CMakeLists.txt | 16 |
1 files changed, 5 insertions, 11 deletions
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 |