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.
master
jp9000 2018-01-23 20:57:48 -08:00
parent 4eb5be4903
commit dce311cf1a
4 changed files with 10 additions and 4 deletions

View File

@ -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)

View File

@ -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

View File

@ -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@

View File

@ -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)