...
 
Commits (4)
......@@ -226,18 +226,27 @@ if (APPLE)
# Take bundle icon from branding dir
IF ( NOT APPLE_BUNDLE_ICON )
# option to set the used Icon for OpenFlipper
set ( APPLE_BUNDLE_ICON "${BRANDING_DIRECTORY}\\mac\\OpenFlipper_Icon.icns" CACHE FILEPATH "Path to the Bundle Icon" )
# Check if the branding directory contains an Icon
if ( EXISTS ${BRANDING_DIRECTORY}/mac/OpenFlipper_Icon.icns )
# Use branding Icon
set ( APPLE_BUNDLE_ICON ${BRANDING_DIRECTORY}/mac/OpenFlipper_Icon.icns CACHE FILEPATH "Path to the Bundle Icon" )
else()
# Use default icon
set ( APPLE_BUNDLE_ICON ${BRANDING_DIRECTORY}/../Icons/OpenFlipper_Icon.icns CACHE FILEPATH "Path to the Bundle Icon" )
message (WARNING "Branding directory found but no branding icon called OpenFlipper_Icon.icns. Using default icon! You can set your icon via APPLE_BUNDLE_ICON")
endif()
ENDIF(NOT APPLE_BUNDLE_ICON )
# Take plist from branding
IF ( NOT APPLE_INFO_PLIST )
if ( EXISTS ${BRANDING_DIRECTORY}/mac/Info.plist )
# option to configure the custom Info.plist
set ( APPLE_INFO_PLIST "${BRANDING_DIRECTORY}\\mac\\Info.plist" CACHE FILEPATH "Path to the Info.plist file for Bundle" )
# Take custom plist from branding directory
set ( APPLE_INFO_PLIST ${BRANDING_DIRECTORY}/mac/Info.plist CACHE FILEPATH "Path to the Info.plist file for Bundle" )
else ( EXISTS ${BRANDING_DIRECTORY}/mac/Info.plist )
# option to configure a custum Info.plist but configure with default one
set ( APPLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/../installer/mac/Info.plist" CACHE FILEPATH "Path to the Info.plist file for Bundle" )
# Take default plist from OpenFlipper
set ( APPLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../installer/mac/Info.plist CACHE FILEPATH "Path to the Info.plist file for Bundle" )
message (WARNING "Branding directory found but no branding plist file found. Using default. You can set your own plist via APPLE_INFO_PLIST")
endif( EXISTS ${BRANDING_DIRECTORY}/mac/Info.plist )
ENDIF(NOT APPLE_INFO_PLIST )
......
......@@ -79,6 +79,17 @@ if (NOT QT5_FOUND)
message(FATAL_ERROR "Could not found any QT Version. Please specify QT5_INSTALL_PATH (path to bin and include dir) to build with QT5")
endif()
if ( WIN32 )
OPTION(USE_UNSUPPORTED_QT "Build OpenFlipper with an unsupported version of Qt e.g. if you fixed the moc issue on 5.8.0 yourself" OFF)
if ( ${Qt5Core_VERSION_STRING} STREQUAL "5.8.0" )
if(USE_UNSUPPORTED_QT)
message(WARNING "You appear to be using Qt 5.8.0 on a Windows System.\n On Windows, this version of Qt causes a problem regarding moc generation.\n You are using this Qt Version on Windows at your own risk and without support." )
else()
message(FATAL_ERROR "You appear to be using Qt 5.8.0 on a Windows System.\n On Windows, this version of Qt causes a problem regarding moc generation.\n Please use another version of Qt, or set the USE_UNSUPPORTED_QT flag")
endif()
endif()
endif()
set (OF_MAX_QT_VERSION "5.9.0")
if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
......