generic: stop using macro_ensure_version()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
index 1a80f46..843ad57 100644 (file)
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
@@ -15,10 +15,8 @@ if(KDEBASE_DISABLE_MULTIMEDIA)
 else(KDEBASE_DISABLE_MULTIMEDIA)
    # TODO: even phonon 4.8.3 identifies itself as "4.4.0" in its namespace
    # header, the version detection should query the .pc files first!
-   set(PHONON_MIN_VERSION "4.4.0")
-   macro_ensure_version("${PHONON_MIN_VERSION}" "${PHONON_VERSION}" _phonon_version_ok)
-   if(NOT _phonon_version_ok)
-    message(FATAL_ERROR "The installed Phonon is too old. Found version ${PHONON_VERSION}. Required is ${PHONON_MIN_VERSION}")
+   if("${PHONON_VERSION}" VERSION_LESS "4.4.0")
+      message(FATAL_ERROR "The installed Phonon is too old. Found version ${PHONON_VERSION}. Required is ${PHONON_MIN_VERSION}")
    endif()
 
    find_package(Alsa)

diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt
index b4552ac..dd95842 100644 (file)
--- a/solid-networkstatus/kded/CMakeLists.txt
+++ b/solid-networkstatus/kded/CMakeLists.txt
@@ -16,13 +16,13 @@ set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager
                       )
 
 if(NETWORKMANAGER_FOUND)
-    macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
-    if(NM_0_7)
+    if(${NETWORKMANAGER_VERSION} VERSION_EQUAL "0.7.0"
+        OR ${NETWORKMANAGER_VERSION} VERSION_GREATER "0.7.0")
         MESSAGE(STATUS "Adding in-process NetworkManager service-wart to kded module")
         set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} networkmanagerstatus.cpp)
         include_directories(${NETWORKMANAGER_INCLUDE_DIRS} ${NM-GLIB_INCLUDE_DIRS})
         add_definitions(-DNM_BACKEND_ENABLED)
-    endif(NM_0_7)
+    endif()
 endif(NETWORKMANAGER_FOUND)
 
 macro_optional_find_package(QNtrack)