diff options
| author | jarcherNV <jarcher@nvidia.com> | 2025-03-06 19:16:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-07 03:16:27 +0000 |
| commit | 9d7d943db47dd7805a710431cf7eedc0bec8ecc7 (patch) | |
| tree | 851f51e2087f76b39ea19a8ca4ec8cf4555a4bb2 /source | |
| parent | 2aaa91007a9f91674033dcb9d88eb9ad7bacae96 (diff) | |
Update build to allow setting external paths (#6528)
* Update build to allow setting external paths
Update the build to allow setting user-specific paths for the external modules.
This allows building Slang without also fetching the external modules, assuming
they are already present elsewhere locally.
Diffstat (limited to 'source')
| -rw-r--r-- | source/core/slang-dictionary.h | 2 | ||||
| -rw-r--r-- | source/core/slang-hash.h | 2 | ||||
| -rw-r--r-- | source/slang/CMakeLists.txt | 12 |
3 files changed, 11 insertions, 5 deletions
diff --git a/source/core/slang-dictionary.h b/source/core/slang-dictionary.h index 79f6dee30..639978a08 100644 --- a/source/core/slang-dictionary.h +++ b/source/core/slang-dictionary.h @@ -1,7 +1,6 @@ #ifndef SLANG_CORE_DICTIONARY_H #define SLANG_CORE_DICTIONARY_H -#include "../../external/unordered_dense/include/ankerl/unordered_dense.h" #include "slang-common.h" #include "slang-exception.h" #include "slang-hash.h" @@ -10,6 +9,7 @@ #include "slang-math.h" #include "slang-uint-set.h" +#include <ankerl/unordered_dense.h> #include <initializer_list> namespace Slang diff --git a/source/core/slang-hash.h b/source/core/slang-hash.h index ebe3d1973..eee58878b 100644 --- a/source/core/slang-hash.h +++ b/source/core/slang-hash.h @@ -1,10 +1,10 @@ #ifndef SLANG_CORE_HASH_H #define SLANG_CORE_HASH_H -#include "../../external/unordered_dense/include/ankerl/unordered_dense.h" #include "slang-math.h" #include "slang.h" +#include <ankerl/unordered_dense.h> #include <cstring> #include <type_traits> diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index b9e78407b..9c51ed767 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -110,9 +110,15 @@ target_include_directories( # if(NOT SLANG_USE_SYSTEM_SPIRV_HEADERS) - set(SLANG_SPIRV_HEADERS_INCLUDE_DIR - "${slang_SOURCE_DIR}/external/spirv-headers/include" - ) + if(NOT SLANG_OVERRIDE_SPIRV_HEADERS_PATH) + set(SLANG_SPIRV_HEADERS_INCLUDE_DIR + "${slang_SOURCE_DIR}/external/spirv-headers/include" + ) + else() + set(SLANG_SPIRV_HEADERS_INCLUDE_DIR + "${SLANG_OVERRIDE_SPIRV_HEADERS_PATH}/include" + ) + endif() endif() set(SLANG_LOOKUP_GENERATOR_INPUT_JSON |