From 42c3a366a3f10d17d633ca47c1ceb94e41accba6 Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Tue, 12 Jun 2018 20:16:35 +0100 Subject: [PATCH] Add ENABLE_STGMERGE option to build stgmerge tool --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bea318dbc..45da1a3bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,6 +214,7 @@ option(ENABLE_TERRASYNC "Set to ON to build the terrasync application (default) option(ENABLE_FGJS "Set to ON to build the fgjs application (default)" ON) option(ENABLE_JS_DEMO "Set to ON to build the js_demo application (default)" ON) option(ENABLE_METAR "Set to ON to build the metar application (default)" ON) +option(ENABLE_STGMERGE "Set to ON to build the stgmerge application (default)" ON) option(ENABLE_TESTS "Set to ON to build test applications (default)" ON) option(ENABLE_FGCOM "Set to ON to build the FGCom application (default)" ON) option(ENABLE_FLITE "Set to ON to build the Flite text-to-speech module" ON) @@ -261,7 +262,7 @@ if(EVENT_INPUT) if(APPLE) add_definitions(-DWITH_EVENTINPUT) find_library(IOKIT_FRAMEWORK IOKit) - list(APPEND EVENT_INPUT_LIBRARIES ${IOKIT_FRAMEWORK}) + list(APPEND EVENT_INPUT_LIBRARIES ${IOKIT_FRAMEWORK}) elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD") if(NOT UDEV_FOUND) message(WARNING "UDev not found, event input is disabled!") @@ -349,7 +350,7 @@ if (ENABLE_QT) if (Qt5Widgets_FOUND) message(STATUS "Will enable Qt launcher GUI") message(STATUS " Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}") - message(STATUS " Qt5Widgets include dir: ${Qt5Widgets_INCLUDE_DIRS}") + message(STATUS " Qt5Widgets include dir: ${Qt5Widgets_INCLUDE_DIRS}") set(HAVE_QT 1) else() # don't try to build FGQCanvas if Qt wasn't found correctly