From f503a0b3faf5d324c62881d61e1ba1e0942becd9 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 21 Aug 2024 15:59:08 +0800 Subject: Dont require llvm for building generators (#4895) * Dont require llvm for building generators * Fetch slang-llvm.so from correct release (#4847) * Fetch slang-llvm.so from correct release Closes https://github.com/shader-slang/slang/issues/4648 Should close https://github.com/shader-slang/slang/issues/4812 * Update docs * Correct documentation on cmake option * Neaten cmake script * Fix fetching on windows --------- Co-authored-by: Yong He * Be a bit more careful dealing with release list fetching failure * clarify error messages --------- Co-authored-by: Yong He --- CMakePresets.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'CMakePresets.json') diff --git a/CMakePresets.json b/CMakePresets.json index cd516c8ea..e87b976bd 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -53,6 +53,14 @@ "cacheVariables": { "SLANG_SLANG_LLVM_FLAVOR": "USE_SYSTEM_LLVM" } + }, + { + "name": "generators", + "inherits": "default", + "description": "Build the compile time generators used in building Slang", + "cacheVariables": { + "SLANG_SLANG_LLVM_FLAVOR": "DISABLE" + } } ], "buildPresets": [ @@ -69,7 +77,7 @@ { "name": "generators", "inherits": "release", - "configurePreset": "default", + "configurePreset": "generators", "targets": [ "all-generators" ] @@ -115,7 +123,7 @@ { "name": "generators", "inherits": "release", - "configurePreset": "default", + "configurePreset": "generators", "variables": { "CPACK_PACKAGE_FILE_NAME": "slang-generators", "CPACK_COMPONENTS_ALL": "generators" @@ -171,7 +179,7 @@ "steps": [ { "type": "configure", - "name": "default" + "name": "generators" }, { "type": "build", -- cgit v1.2.3