fly/flightgear
1
0
Fork 0
Code Activity

- Make Qt check guarded by a CMake option

Browse source 
- Only init QApplication if showing the launcher.
This commit is contained in:
James Turner 2015-01-10 14:05:23 +00:00
parent e94371ebfc
commit 7d9609116b
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -170,6 +170,7 @@ option(ENABLE_METAR "Set to ON to build the metar application (default)" ON
option(ENABLE_TESTS "Set to ON to build test applications (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_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) option(ENABLE_FLITE "Set to ON to build the Flite text-to-speech module" ON)
option(ENABLE_QT "Set to ON to build the internal Qt launcher" ON)
if(LOGGING) if(LOGGING)
# nothing # nothing
@ -279,13 +280,14 @@ list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
############################################################################## ##############################################################################
## Qt5 setup setup ## Qt5 setup setup
if (ENABLE_QT)
find_package(Qt5 5.1 COMPONENTS Widgets) message(STATUS "Qt launcher enabled, checking for Qt 5.1 / qmake")
if (Qt5Widgets_FOUND) find_package(Qt5 5.1 COMPONENTS Widgets)
message(STATUS "Will enable Qt launcher GUI") if (Qt5Widgets_FOUND)
set(HAVE_QT 1) message(STATUS "Will enable Qt launcher GUI")
endif() set(HAVE_QT 1)
endif()
endif (ENABLE_QT)
############################################################################## ##############################################################################
find_package(PLIB REQUIRED puaux pu js fnt) find_package(PLIB REQUIRED puaux pu js fnt)

14
src/Main/main.cxx
View file

@ -401,13 +401,6 @@ static void logToFile()
// Main top level initialization // Main top level initialization
int fgMainInit( int argc, char **argv ) int fgMainInit( int argc, char **argv )
{ {
#if defined(HAVE_QT)
QApplication app(argc, argv);
app.setOrganizationName("FlightGear");
app.setApplicationName("FlightGear");
app.setOrganizationDomain("flightgear.org");
#endif
// set default log levels // set default log levels
sglog().setLogLevels( SG_ALL, SG_ALERT ); sglog().setLogLevels( SG_ALL, SG_ALERT );
@ -464,7 +457,12 @@ int fgMainInit( int argc, char **argv )
// environment variables. This avoids needed a wrapper shell-script on OS-X. // environment variables. This avoids needed a wrapper shell-script on OS-X.
showLauncher |= (::getenv("FG_LAUNCHER") != 0); showLauncher |= (::getenv("FG_LAUNCHER") != 0);
if (showLauncher) { if (showLauncher) {
QApplication app(argc, argv);
app.setOrganizationName("FlightGear");
app.setApplicationName("FlightGear");
app.setOrganizationDomain("flightgear.org");
// avoid double Apple menu and other weirdness if both Qt and OSG // avoid double Apple menu and other weirdness if both Qt and OSG
// try to initialise various Cocoa structures. // try to initialise various Cocoa structures.
flightgear::WindowBuilder::setPoseAsStandaloneApp(false); flightgear::WindowBuilder::setPoseAsStandaloneApp(false);