X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2FQuasselMacros.cmake;h=bc665725d77e274d38f70d552fb8607143af878a;hp=3a6244f78e92de157b9780ac3d8885c978d864af;hb=0216d4a650c02155b5bcd517567209f674d8a120;hpb=cd1a1f138ec3a0b1ade92e35e62d43913eb055d1

diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
index 3a6244f7..bc665725 100644
--- a/cmake/QuasselMacros.cmake
+++ b/cmake/QuasselMacros.cmake
@@ -2,8 +2,8 @@
 #
 # (C) 2014 by the Quassel Project <devel@quassel-irc.org>
 #
-# The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
-# (C) 2005-2009 Kitware, Inc.
+# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
+# (C) 2005-2011 Kitware, Inc.
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -12,83 +12,41 @@
 # Macros for dealing with Qt
 ############################
 
-# CMake gained this function in 2.8.10. To be able to use older versions, we've copied
-# this here. If present, the function from CMake will take precedence and our copy will be ignored.
-function(qt4_use_modules _target _link_type)
-    if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE")
-        set(modules ${ARGN})
-        set(link_type ${_link_type})
+# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version.
+# If present, the Qt-provided version will be used automatically instead.
+function(qt5_use_modules _target _link_type)
+    if (NOT TARGET ${_target})
+        message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
+    endif()
+    if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
+        set(_qt5_modules ${ARGN})
+        set(_qt5_link_type ${_link_type})
     else()
-        set(modules ${_link_type} ${ARGN})
+        set(_qt5_modules ${_link_type} ${ARGN})
     endif()
-    foreach(_module ${modules})
-        string(TOUPPER ${_module} _ucmodule)
-        set(_targetPrefix QT_QT${_ucmodule})
-        if (_ucmodule STREQUAL QAXCONTAINER OR _ucmodule STREQUAL QAXSERVER)
-            if (NOT QT_Q${_ucmodule}_FOUND)
-                message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
-            endif()
-            set(_targetPrefix QT_Q${_ucmodule})
-        else()
-            if (NOT QT_QT${_ucmodule}_FOUND)
+
+    if ("${_qt5_modules}" STREQUAL "")
+        message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
+    endif()
+    foreach(_module ${_qt5_modules})
+        if (NOT Qt5${_module}_FOUND)
+            find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
+            if (NOT Qt5${_module}_FOUND)
                 message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
             endif()
-            if ("${_ucmodule}" STREQUAL "MAIN")
-                message(FATAL_ERROR "Can not use \"${_module}\" module with qt4_use_modules.")
-            endif()
         endif()
-        target_link_libraries(${_target} ${link_type} ${${_targetPrefix}_LIBRARIES})
-        set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${${_targetPrefix}_INCLUDE_DIR} ${QT_HEADERS_DIR} ${QT_MKSPECS_DIR}/default)
-        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${${_targetPrefix}_COMPILE_DEFINITIONS})
+        target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
+        set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
+        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
+        if (Qt5_POSITION_INDEPENDENT_CODE
+                AND (CMAKE_VERSION VERSION_LESS 2.8.12
+                    AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+                    OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
+            set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
+        endif()
     endforeach()
 endfunction()
 
-# Some wrappers for simplifying dual-Qt support
-
-function(qt_use_modules)
-    if (WITH_QT5)
-        qt5_use_modules(${ARGN})
-    else()
-        qt4_use_modules(${ARGN})
-    endif()
-endfunction()
-
-function(qt_wrap_ui _var)
-    if (WITH_QT5)
-        qt5_wrap_ui(var ${ARGN})
-    else()
-        qt4_wrap_ui(var ${ARGN})
-    endif()
-    set(${_var} ${${_var}} ${var} PARENT_SCOPE)
-endfunction()
-
-function(qt_add_resources _var)
-    if (WITH_QT5)
-        qt5_add_resources(var ${ARGN})
-    else()
-        qt4_add_resources(var ${ARGN})
-    endif()
-    set(${_var} ${${_var}} ${var} PARENT_SCOPE)
-endfunction()
-
-function(qt_add_dbus_interface _var)
-    if (WITH_QT5)
-        qt5_add_dbus_interface(var ${ARGN})
-    else()
-        qt4_add_dbus_interface(var ${ARGN})
-    endif()
-    set(${_var} ${${_var}} ${var} PARENT_SCOPE)
-endfunction()
-
-function(qt_add_dbus_adaptor _var)
-    if (WITH_QT5)
-        qt5_add_dbus_adaptor(var ${ARGN})
-    else()
-        qt4_add_dbus_adaptor(var ${ARGN})
-    endif()
-    set(${_var} ${${_var}} ${var} PARENT_SCOPE)
-endfunction()
-
 ######################################
 # Macros for dealing with translations
 ######################################