From dce311cf1a80298fb32978f4e1914efd9cf0c58a Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Tue, 23 Jan 2018 20:57:48 -0800
Subject: [PATCH] deps/obs-scripting: Make ENABLE_SCRIPTING a user variable

Makes it so that the scripting cmake variable ENABLE_SCRIPTING is a user
variable rather than a global internal cmake variable, and defers the
internal global cmake variable to SCRIPTING_ENABLED instead.
---
 CMakeLists.txt                                             | 3 ++-
 UI/frontend-plugins/frontend-tools/CMakeLists.txt          | 2 +-
 .../frontend-tools/frontend-tools-config.h.in              | 2 +-
 deps/obs-scripting/CMakeLists.txt                          | 7 ++++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1323fc7bd..e792ad618 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,8 @@ if(WIN32)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-set(ENABLE_SCRIPTING OFF CACHE BOOL "" FORCE)
+set(ENABLE_SCRIPTING TRUE CACHE BOOL "Enables scripting")
+set(SCRIPTING_ENABLED OFF CACHE BOOL "Interal global cmake variable" FORCE)
 
 include(ObsHelpers)
 include(ObsCpack)
diff --git a/UI/frontend-plugins/frontend-tools/CMakeLists.txt b/UI/frontend-plugins/frontend-tools/CMakeLists.txt
index 44bb4e219..37a022a88 100644
--- a/UI/frontend-plugins/frontend-tools/CMakeLists.txt
+++ b/UI/frontend-plugins/frontend-tools/CMakeLists.txt
@@ -43,7 +43,7 @@ set(frontend-tools_UI
 	forms/output-timer.ui
 	)
 
-if(ENABLE_SCRIPTING)
+if(SCRIPTING_ENABLED)
 	set(frontend-tools_HEADERS
 		${frontend-tools_HEADERS}
 		scripts.hpp
diff --git a/UI/frontend-plugins/frontend-tools/frontend-tools-config.h.in b/UI/frontend-plugins/frontend-tools/frontend-tools-config.h.in
index 1b7210597..8bc3af969 100644
--- a/UI/frontend-plugins/frontend-tools/frontend-tools-config.h.in
+++ b/UI/frontend-plugins/frontend-tools/frontend-tools-config.h.in
@@ -17,6 +17,6 @@
 #endif
 
 #define BUILD_CAPTIONS @BUILD_CAPTIONS@
-#define ENABLE_SCRIPTING @ENABLE_SCRIPTING@
+#define ENABLE_SCRIPTING @SCRIPTING_ENABLED@
 #define COMPILE_LUA @COMPILE_LUA@
 #define COMPILE_PYTHON @COMPILE_PYTHON@
diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
index 2e6f32742..835c1b305 100644
--- a/deps/obs-scripting/CMakeLists.txt
+++ b/deps/obs-scripting/CMakeLists.txt
@@ -1,4 +1,9 @@
 cmake_minimum_required(VERSION 2.8)
+
+if(NOT ENABLE_SCRIPTING)
+	return()
+endif()
+
 project(obs-scripting)
 
 if(MSVC)
@@ -46,7 +51,7 @@ else()
 	endif()
 endif()
 
-set(ENABLE_SCRIPTING ON CACHE BOOL "" FORCE)
+set(SCRIPTING_ENABLED ON CACHE BOOL "Interal global cmake variable" FORCE)
 
 if(UI_ENABLED)
 	set(EXTRA_LIBS obs-frontend-api)