X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2FQuasselMacros.cmake;h=652c0042d515ce5c23f1a23b065fd92df68fa63c;hp=eb9dca6d7b218bf063eee5b5e03b92951cd7f85a;hb=32c0bb666209932d7540c22ddc393fd4550d5418;hpb=ce26c3770b254362c7bd1e094ba8f8bf22133653

diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
index eb9dca6d..652c0042 100644
--- a/cmake/QuasselMacros.cmake
+++ b/cmake/QuasselMacros.cmake
@@ -14,8 +14,7 @@
 
 # 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(quassel_qt4_use_modules _target _link_type)
-    message("SPUT calling")
+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})
@@ -47,7 +46,7 @@ endfunction()
 # Some wrappers for simplifying dual-Qt support
 
 function(qt_use_modules)
-    if (WITH_QT5)
+    if (USE_QT5)
         qt5_use_modules(${ARGN})
     else()
         qt4_use_modules(${ARGN})
@@ -55,7 +54,7 @@ function(qt_use_modules)
 endfunction()
 
 function(qt_wrap_ui _var)
-    if (WITH_QT5)
+    if (USE_QT5)
         qt5_wrap_ui(var ${ARGN})
     else()
         qt4_wrap_ui(var ${ARGN})
@@ -64,7 +63,7 @@ function(qt_wrap_ui _var)
 endfunction()
 
 function(qt_add_resources _var)
-    if (WITH_QT5)
+    if (USE_QT5)
         qt5_add_resources(var ${ARGN})
     else()
         qt4_add_resources(var ${ARGN})
@@ -73,7 +72,7 @@ function(qt_add_resources _var)
 endfunction()
 
 function(qt_add_dbus_interface _var)
-    if (WITH_QT5)
+    if (USE_QT5)
         qt5_add_dbus_interface(var ${ARGN})
     else()
         qt4_add_dbus_interface(var ${ARGN})
@@ -82,7 +81,7 @@ function(qt_add_dbus_interface _var)
 endfunction()
 
 function(qt_add_dbus_adaptor _var)
-    if (WITH_QT5)
+    if (USE_QT5)
         qt5_add_dbus_adaptor(var ${ARGN})
     else()
         qt4_add_dbus_adaptor(var ${ARGN})