Improvements to device selection

This commit is contained in:
Jonas Kvinge
2018-06-07 19:38:40 +02:00
parent d45f8672cd
commit 60b55b6d7d
10 changed files with 66 additions and 57 deletions

View File

@@ -19,7 +19,6 @@
project(strawberry)
cmake_minimum_required(VERSION 2.8.11)
cmake_policy(SET CMP0054 NEW)
cmake_policy(SET CMP0072 NEW)
include(CheckCXXCompilerFlag)
include(CheckIncludeFiles)
@@ -141,9 +140,6 @@ else()
set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::OpenGL Qt5::Xml)
endif()
# Remove GLU and GL from the link line - they're not really required and don't exist on my mingw toolchain
list(REMOVE_ITEM QT_LIBRARIES "-lGLU -lGL")
# Don't try to use webkit if their include directories couldn't be found.
if (NOT QT_QTWEBKIT_INCLUDE_DIR)
set (QT_USE_QTWEBKIT 0)