From 917b114b49fb2ddbc12be6971fe7d58132e34984 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 2 Mar 2016 19:44:49 +0100 Subject: [PATCH] CMake LUA variable is now a string (YES/NO/NO_MODEL_SCRIPTS) --- radio/src/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index b3215571a..582048bbe 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -369,7 +369,7 @@ if(CPU_TYPE STREQUAL STM32F2) endif() if(CPU_FAMILY STREQUAL STM32) - option(LUA "Lua scripts") + set(LUA "NO" CACHE STRING "Lua scripts (YES/NO/NO_MODEL_SCRIPTS)") set(USB "JOYSTICK" CACHE STRING "USB option (JOYSTICK/MASSSTORAGE/SERIAL)") set(ARCH ARM) set(STM32USB_DIR ${THIRDPARTY_DIR}/STM32_USB-Host-Device_Lib_V2.1.0/Libraries) @@ -705,11 +705,11 @@ if(TEMPLATES) set(GUI_SRC ${GUI_SRC} menu_model_templates.cpp) endif() -if(LUA) +if(NOT LUA STREQUAL NO) add_definitions(-DLUA) include_directories(${LUA_DIR}) set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${LUA_EXPORT}) - if(LUA STREQUAL ON) + if(LUA STREQUAL YES) add_definitions(-DLUA_MODEL_SCRIPTS) set(GUI_SRC ${GUI_SRC} menu_model_custom_scripts.cpp) endif()