[Pkg-owncloud-commits] [owncloud-client] 296/333: Avoid build attempts with Qt4 on Windows and Linux

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 4bcd620c290ae672ff1b53432fe0f3a2243a47e0
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Fri Apr 4 09:28:49 2014 +0200

    Avoid build attempts with Qt4 on Windows and Linux
---
 cmake/modules/QtVersionAbstraction.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake
index 0099da2..8326174 100644
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -79,7 +79,7 @@ endif()
         add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0")
     endif()
 endif()
-if( NOT Qt5Core_DIR )
+if( NOT WIN32 AND NOT APPLE AND NOT Qt5Core_DIR)
     message(STATUS "Could not find Qt5, searching for Qt4 instead...")
 
     set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit")
@@ -88,7 +88,7 @@ if( NOT Qt5Core_DIR )
     endif()
 
     find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
-    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
+    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://www.qt-project.org" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
 
     macro(qt5_use_modules)
     endmacro()
@@ -131,6 +131,8 @@ if( NOT Qt5Core_DIR )
 
         include( ${QT_USE_FILE} )
     endmacro()
+else()
+    message(ERROR "Qt 5 not found, but application depends on Qt5 on Windows and Mac OS X")
 endif()
 
 if( Qt5Core_DIR )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git