From 1750db9a7d4a3988c182a78f7cc62397792dc06a Mon Sep 17 00:00:00 2001 From: lujinwangnv <143145775+lujinwangnv@users.noreply.github.com> Date: Mon, 19 May 2025 21:38:53 -0700 Subject: Update build to allow setting external lua path (#7167) * Update build to allow setting external lua path Update the build to allow setting user-specific path for the external module lua. * T * Fix an include path --- CMakeLists.txt | 5 +++++ tools/CMakeLists.txt | 18 +++++++++++++++++- tools/slang-fiddle/slang-fiddle-lua.cpp | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a933d0ab6..98eb4d9c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,6 +223,11 @@ advanced_option( "Build using user defined path for tinyobjloader" OFF ) +advanced_option( + SLANG_OVERRIDE_LUA_PATH + "Build using user defined path for lua" + OFF +) advanced_option( SLANG_EXCLUDE_DAWN diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index d871f91f2..aad87e21d 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -45,7 +45,23 @@ function(generator dir) endif() endfunction() -generator(slang-fiddle LINK_WITH_PRIVATE compiler-core) +if(NOT SLANG_OVERRIDE_LUA_PATH) + generator( + slang-fiddle + LINK_WITH_PRIVATE + compiler-core + INCLUDE_DIRECTORIES_PUBLIC + ${slang_SOURCE_DIR}/external/lua + ) +else() + generator( + slang-fiddle + LINK_WITH_PRIVATE + compiler-core + INCLUDE_DIRECTORIES_PUBLIC + ${SLANG_OVERRIDE_LUA_PATH} + ) +endif() generator(slang-embed) generator(slang-generate USE_FEWER_WARNINGS) generator(slang-lookup-generator LINK_WITH_PRIVATE compiler-core) diff --git a/tools/slang-fiddle/slang-fiddle-lua.cpp b/tools/slang-fiddle/slang-fiddle-lua.cpp index f6ba36357..0d5f04eca 100644 --- a/tools/slang-fiddle/slang-fiddle-lua.cpp +++ b/tools/slang-fiddle/slang-fiddle-lua.cpp @@ -2,4 +2,4 @@ #define MAKE_LIB 1 -#include "../external/lua/onelua.c" +#include "onelua.c" -- cgit v1.2.3