diff options
| author | Tobias Frisch <jacki@thejackimonster.de> | 2024-10-04 10:34:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-04 16:34:12 +0800 |
| commit | 25c17b9fcbf7a21e9fa19c4a8f08b0406437be24 (patch) | |
| tree | a85a734b32ea4f27a9cd594586a328858965893b /source/core | |
| parent | 9f246a43667b4893040669873400e2e3813328ff (diff) | |
Allow building using external dependencies (#5076)
* Add options to prevent usage of own submodules
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Allow using external unordered dense headers
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Link system wide installed unordered dense
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Allow external header usage for lz4 and spirv
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Add more options to disable targets
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Add option to provide explizit path for spirv headers and remove earlier options that break the build process
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Rename options to use common prefix
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Fix indentation for the cmake changes
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Add advanced_option function for cmake
* Normalize includes between system and submodule dependencies
Fix any before-accidentally-working problems
* Add option for enabling/disabling slang-rhi
Signed-off-by: Jacki <jacki@thejackimonster.de>
* Pass correct include path for cpu tests
* Correct include path
---------
Signed-off-by: Jacki <jacki@thejackimonster.de>
Co-authored-by: Ellie Hermaszewska <ellieh@nvidia.com>
Diffstat (limited to 'source/core')
| -rw-r--r-- | source/core/slang-dictionary.h | 4 | ||||
| -rw-r--r-- | source/core/slang-hash.h | 4 | ||||
| -rw-r--r-- | source/core/slang-lz4-compression-system.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source/core/slang-dictionary.h b/source/core/slang-dictionary.h index ba4672740..9c445c3c9 100644 --- a/source/core/slang-dictionary.h +++ b/source/core/slang-dictionary.h @@ -8,7 +8,9 @@ #include "slang-exception.h" #include "slang-math.h" #include "slang-hash.h" -#include "../../external/unordered_dense/include/ankerl/unordered_dense.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 784f7fd23..3e255f7db 100644 --- a/source/core/slang-hash.h +++ b/source/core/slang-hash.h @@ -3,7 +3,9 @@ #include "../../include/slang.h" #include "slang-math.h" -#include "../../external/unordered_dense/include/ankerl/unordered_dense.h" + +#include <ankerl/unordered_dense.h> + #include <cstring> #include <type_traits> diff --git a/source/core/slang-lz4-compression-system.cpp b/source/core/slang-lz4-compression-system.cpp index c20b457df..1e2ab9558 100644 --- a/source/core/slang-lz4-compression-system.cpp +++ b/source/core/slang-lz4-compression-system.cpp @@ -5,7 +5,7 @@ #include "slang-blob.h" -#include "../../external/lz4/lib/lz4.h" +#include <lz4.h> namespace Slang { |