mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 11:37:58 +02:00
optionally check /usr/local/lib for plugins
This commit is contained in:
parent
e1e451b4f2
commit
4d9075f21c
2 changed files with 13 additions and 7 deletions
|
@ -45,6 +45,12 @@ endforeach(SUBDIR)
|
||||||
# project subdirectories
|
# project subdirectories
|
||||||
add_subdirectory(src/starfield)
|
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)
|
if (APPLE)
|
||||||
# set how the icon shows up in the Info.plist file
|
# set how the icon shows up in the Info.plist file
|
||||||
SET(MACOSX_BUNDLE_ICON_FILE interface.icns)
|
SET(MACOSX_BUNDLE_ICON_FILE interface.icns)
|
||||||
|
@ -64,15 +70,8 @@ if (APPLE)
|
||||||
SET(INTERFACE_SRCS ${INTERFACE_SRCS} ${DIR_CONTENTS})
|
SET(INTERFACE_SRCS ${INTERFACE_SRCS} ${DIR_CONTENTS})
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
endif (APPLE)
|
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)
|
set(QUAZIP_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/quazip)
|
||||||
add_subdirectory(external/fervor/)
|
add_subdirectory(external/fervor/)
|
||||||
include_directories(external/fervor/)
|
include_directories(external/fervor/)
|
||||||
|
|
|
@ -18,12 +18,19 @@
|
||||||
#include "Application.h"
|
#include "Application.h"
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QDir>
|
||||||
|
|
||||||
int main(int argc, const char * argv[]) {
|
int main(int argc, const char * argv[]) {
|
||||||
timeval startup_time;
|
timeval startup_time;
|
||||||
gettimeofday(&startup_time, NULL);
|
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<char**>(argv), startup_time);
|
Application app(argc, const_cast<char**>(argv), startup_time);
|
||||||
|
|
||||||
qDebug( "Created QT Application.\n" );
|
qDebug( "Created QT Application.\n" );
|
||||||
int exitCode = app.exec();
|
int exitCode = app.exec();
|
||||||
qDebug("Normal exit.\n");
|
qDebug("Normal exit.\n");
|
||||||
|
|
Loading…
Reference in a new issue