diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 17967c5f42..babbff7289 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -45,6 +45,12 @@ endforeach(SUBDIR) # project subdirectories add_subdirectory(src/starfield) +find_package(Qt5Core REQUIRED) +find_package(Qt5Gui REQUIRED) +find_package(Qt5Network REQUIRED) +find_package(Qt5OpenGL REQUIRED) +find_package(Qt5Svg REQUIRED) + if (APPLE) # set how the icon shows up in the Info.plist file SET(MACOSX_BUNDLE_ICON_FILE interface.icns) @@ -64,15 +70,8 @@ if (APPLE) SET(INTERFACE_SRCS ${INTERFACE_SRCS} ${DIR_CONTENTS}) endif() endforeach() - endif (APPLE) -find_package(Qt5Core REQUIRED) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Network REQUIRED) -find_package(Qt5OpenGL REQUIRED) -find_package(Qt5Svg REQUIRED) - set(QUAZIP_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/quazip) add_subdirectory(external/fervor/) include_directories(external/fervor/) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 98ed4fb231..c1d9bd778d 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -18,12 +18,19 @@ #include "Application.h" #include +#include int main(int argc, const char * argv[]) { timeval startup_time; gettimeofday(&startup_time, NULL); + #if defined(Q_OS_MAC) + const QString QT_RELEASE_PLUGIN_PATH = "/usr/local/lib/qt5/plugins"; + QCoreApplication::addLibraryPath(QT_RELEASE_PLUGIN_PATH); + #endif + Application app(argc, const_cast(argv), startup_time); + qDebug( "Created QT Application.\n" ); int exitCode = app.exec(); qDebug("Normal exit.\n");