| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame^] | 1 | From b3da0d8677b7e8467367a303c18551c56ed20e15 Mon Sep 17 00:00:00 2001 |
| 2 | From: Philip Balister <philip@balister.org> |
| 3 | Date: Tue, 12 Apr 2016 17:30:15 -0400 |
| 4 | Subject: [PATCH] Forcibly disable check for Qt5. |
| 5 | |
| 6 | Signed-off-by: Philip Balister <philip@balister.org> |
| 7 | --- |
| 8 | build/cmake/DefineOptions.cmake | 3 --- |
| 9 | 1 file changed, 3 deletions(-) |
| 10 | |
| 11 | diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake |
| 12 | index 62e240f..f8b4493 100644 |
| 13 | --- a/build/cmake/DefineOptions.cmake |
| 14 | +++ b/build/cmake/DefineOptions.cmake |
| 15 | @@ -52,9 +52,6 @@ CMAKE_DEPENDENT_OPTION(WITH_LIBEVENT "Build with libevent support" ON |
| 16 | find_package(Qt4 QUIET COMPONENTS QtCore QtNetwork) |
| 17 | CMAKE_DEPENDENT_OPTION(WITH_QT4 "Build with Qt4 support" ON |
| 18 | "QT4_FOUND" OFF) |
| 19 | -find_package(Qt5 QUIET COMPONENTS Core Network) |
| 20 | -CMAKE_DEPENDENT_OPTION(WITH_QT5 "Build with Qt5 support" ON |
| 21 | - "Qt5_FOUND" OFF) |
| 22 | if(${WITH_QT4} AND ${WITH_QT5} AND ${CMAKE_MAJOR_VERSION} LESS 3) |
| 23 | # cmake < 3.0.0 causes conflict when building both Qt4 and Qt5 |
| 24 | set(WITH_QT4 OFF) |
| 25 | -- |
| 26 | 2.5.5 |
| 27 | |