From 25c17b9fcbf7a21e9fa19c4a8f08b0406437be24 Mon Sep 17 00:00:00 2001 From: Tobias Frisch Date: Fri, 4 Oct 2024 10:34:12 +0200 Subject: Allow building using external dependencies (#5076) * Add options to prevent usage of own submodules Signed-off-by: Jacki * Allow using external unordered dense headers Signed-off-by: Jacki * Link system wide installed unordered dense Signed-off-by: Jacki * Allow external header usage for lz4 and spirv Signed-off-by: Jacki * Add more options to disable targets Signed-off-by: Jacki * Add option to provide explizit path for spirv headers and remove earlier options that break the build process Signed-off-by: Jacki * Rename options to use common prefix Signed-off-by: Jacki * Fix indentation for the cmake changes Signed-off-by: Jacki * 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 * Pass correct include path for cpu tests * Correct include path --------- Signed-off-by: Jacki Co-authored-by: Ellie Hermaszewska --- tools/slang-test/slang-test-main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index 47a87ddc2..a620a7120 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -1659,6 +1659,8 @@ TestResult runExecutableTest(TestContext* context, TestInput& input) args.add("exe"); args.add("-Xgenericcpp"); args.add("-I./include"); + args.add("-Xgenericcpp"); + args.add("-I./external/unordered_dense/include"); for (auto arg : args) { // If unescaping is needed, do it @@ -2426,7 +2428,7 @@ static TestResult runCPPCompilerSharedLibrary(TestContext* context, TestInput& i TerminatedCharSlice includePaths[] = { TerminatedCharSlice(".") }; options.sourceArtifacts = makeSlice(sourceArtifact.readRef(), 1); - options.includePaths = makeSlice(includePaths, 1); + options.includePaths = makeSlice(includePaths, SLANG_COUNT_OF(includePaths)); options.modulePath = SliceUtil::asTerminatedCharSlice(modulePath); ComPtr artifact; -- cgit v1.2.3