[Pkg-owncloud-commits] [owncloud-client] 324/333: Fix Search for Qt5 version Qt4

[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 7d79d3d30d9c1c22a653e976c34b73b455ffda06
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Apr 8 12:08:01 2014 +0200

    Fix Search for Qt5 version Qt4
---
 cmake/modules/QtVersionAbstraction.cmake | 73 +++++++++++++++++---------------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake
index ce17657..b83f373 100644
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -3,76 +3,81 @@ include (MacroLogFeature)
 
 option(BUILD_WITH_QT4 "Build with Qt4 no matter if Qt5 was found" OFF)
 
-if( NOT BUILD_WITH_QT4 )
+if( BUILD_WITH_QT4 )
+    message(STATUS "Search for Qt5 was disalbed by option BUILD_WITH_QT4")
+else( BUILD_WITH_QT4 )
     find_package(Qt5Core QUIET)
-    if( Qt5Core_FOUND )
-        message(STATUS "Found Qt5 core, checking for further dependencies...")
-        find_package(Qt5Widgets REQUIRED)
-        find_package(Qt5Quick REQUIRED)
-        find_package(Qt5PrintSupport REQUIRED)
-        find_package(Qt5WebKit REQUIRED)
-        find_package(Qt5Network REQUIRED)
-        find_package(Qt5Xml REQUIRED)
-        find_package(Qt5WebKitWidgets REQUIRED)
-        if(APPLE)
-            find_package(Qt5MacExtras REQUIRED)
-        endif(APPLE)
-    else( Qt5Core_FOUND )
-        if(WIN32 OR APPLE)
-            message(FATAL_ERROR "Qt 5 not found, but application depends on Qt5 on Windows and Mac OS X")
-        endif(WIN32 OR APPLE)
-    endif( Qt5Core_FOUND )
+endif( BUILD_WITH_QT4 )
+
+if( Qt5Core_FOUND )
+    message(STATUS "Found Qt5 core, checking for further dependencies...")
+    find_package(Qt5Widgets REQUIRED)
+    find_package(Qt5Quick REQUIRED)
+    find_package(Qt5PrintSupport REQUIRED)
+    find_package(Qt5WebKit REQUIRED)
+    find_package(Qt5Network REQUIRED)
+    find_package(Qt5Xml REQUIRED)
+    find_package(Qt5WebKitWidgets REQUIRED)
+    if(APPLE)
+	find_package(Qt5MacExtras REQUIRED)
+    endif(APPLE)
+else( Qt5Core_FOUND )
+    if(WIN32 OR APPLE)
+	message(FATAL_ERROR "Qt 5 not found, but application depends on Qt5 on Windows and Mac OS X")
+    endif(WIN32 OR APPLE)
+endif( Qt5Core_FOUND )
 
 
+if( Qt5Core_FOUND )
     message(STATUS "Using Qt 5!")
 
-   # We need this to find the paths to qdbusxml2cpp and co
+    # We need this to find the paths to qdbusxml2cpp and co
     if (WITH_DBUS)
-        find_package(Qt5DBus REQUIRED)
-        include_directories(${Qt5DBus_INCLUDES})
-        add_definitions(${Qt5DBus_DEFINITIONS})
+	find_package(Qt5DBus REQUIRED)
+	include_directories(${Qt5DBus_INCLUDES})
+	add_definitions(${Qt5DBus_DEFINITIONS})
     endif (WITH_DBUS)
 
     include_directories(${Qt5Widgets_INCLUDES})
     add_definitions(${Qt5Widgets_DEFINITIONS})
     if (NOT WIN32) #implied on Win32
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
     endif(NOT WIN32)
 #        set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
     if(APPLE)
-        include_directories(${Qt5MacExtras_INCLUDE_DIRS})
-        add_definitions(${Qt5MacExtras_DEFINITIONS})
-        set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+	include_directories(${Qt5MacExtras_INCLUDE_DIRS})
+	add_definitions(${Qt5MacExtras_DEFINITIONS})
+	set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
     endif(APPLE)
 
     macro(qt_wrap_ui)
-        qt5_wrap_ui(${ARGN})
+	qt5_wrap_ui(${ARGN})
     endmacro()
 
     macro(qt_add_resources)
-        qt5_add_resources(${ARGN})
+	qt5_add_resources(${ARGN})
     endmacro()
 
     find_package(Qt5LinguistTools REQUIRED)
     macro(qt_add_translation)
-        qt5_add_translation(${ARGN})
+	qt5_add_translation(${ARGN})
     endmacro()
 
     macro(qt_add_dbus_interface)
-        qt5_add_dbus_interface(${ARGN})
+	qt5_add_dbus_interface(${ARGN})
     endmacro()
 
     macro(qt_add_dbus_adaptor)
-        qt5_add_dbus_adaptor(${ARGN})
+	qt5_add_dbus_adaptor(${ARGN})
     endmacro()
 
     macro(qt_wrap_cpp)
-        qt5_wrap_cpp(${ARGN})
+	qt5_wrap_cpp(${ARGN})
     endmacro()
 
     macro(install_qt_executable)
-        install_qt5_executable(${ARGN})
+	install_qt5_executable(${ARGN})
     endmacro()
 
     macro(setup_qt)
@@ -82,7 +87,7 @@ if( NOT BUILD_WITH_QT4 )
 
     #Enable deprecated symbols
     add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0")
-endif()
+endif( Qt5Core_FOUND )
 
 if(NOT Qt5Core_FOUND)
     message(STATUS "Could not find Qt5, searching for Qt4 instead...")

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