From 3ba702690cef93fa7a24683279d3b79f11ad0a7f Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 20 Sep 2025 16:07:59 +0200
Subject: [PATCH] Require SOL_PROPAGATE_EXCEPTIONS to be off

---
 CMakeLists.txt              | 2 +-
 components/lua/luastate.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66b4e9debc..4b4ec61455 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -481,6 +481,7 @@ set(SOL_INCLUDE_DIR ${OpenMW_SOURCE_DIR}/extern/sol3)
 set(SOL_CONFIG_DIR ${OpenMW_SOURCE_DIR}/extern/sol_config)
 
 include_directories(
+    ${SOL_CONFIG_DIR}
     "."
     BEFORE SYSTEM
     ${MyGUI_INCLUDE_DIRS}
@@ -489,7 +490,6 @@ include_directories(
     ${BULLET_INCLUDE_DIRS}
     ${LUA_INCLUDE_DIR}
     ${SOL_INCLUDE_DIR}
-    ${SOL_CONFIG_DIR}
     ${ICU_INCLUDE_DIRS}
 )
 
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
index b705dc0f5f..aa2f93d1c7 100644
--- a/components/lua/luastate.cpp
+++ b/components/lua/luastate.cpp
@@ -15,6 +15,10 @@
 #include "scriptscontainer.hpp"
 #include "utf8.hpp"
 
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+#error SOL_PROPAGATE_EXCEPTIONS inhibits error checking
+#endif
+
 namespace LuaUtil
 {
     static VFS::Path::Normalized packageNameToVfsPath(std::string_view packageName, const VFS::Manager& vfs)