diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 19449d9d37..4fe4cb9540 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -510,7 +510,7 @@ if(wxUSE_GUI)
         if(NOT LIBNOTIFY_FOUND)
             message(WARNING "Libnotify not found, it won't be used for notifications")
             wx_option_force_value(wxUSE_LIBNOTIFY OFF)
-        elseif((LIBNOTIFY_VERSION GREATER 0.7) OR (LIBNOTIFY_VERSION EQUAL 0.7))
+        elseif(LIBNOTIFY_VERSION VERSION_GREATER_EQUAL 0.7)
             set(wxUSE_LIBNOTIFY_0_7 ON)
         endif()
     else()
diff --git a/build/cmake/modules/FindGNOMEVFS2.cmake b/build/cmake/modules/FindGNOMEVFS2.cmake
index 1dccf3a2bf..1313975ea1 100644
--- a/build/cmake/modules/FindGNOMEVFS2.cmake
+++ b/build/cmake/modules/FindGNOMEVFS2.cmake
@@ -78,7 +78,7 @@ else (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS)
       message(STATUS "Found GnomeVFS2: ${GNOMEVFS2_LIBRARIES}")
     endif (NOT GNOMEVFS2_FIND_QUIETLY)
   else (GNOMEVFS2_FOUND)
-    if (GnomeVFS2_FIND_REQUIRED)
+    if (GNOMEVFS2_FIND_REQUIRED)
       message(FATAL_ERROR "Could not find GnomeVFS2")
     endif (GNOMEVFS2_FIND_REQUIRED)
   endif (GNOMEVFS2_FOUND)
diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index d294178203..fcb784b6ca 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -57,8 +57,8 @@ endif()
 
 if(WXGTK)
     # Add GTK version definitions
-    foreach(gtk_version 1.2.7 2.0 2.10 2.18 2.20 3.0 3.90.0)
-        if(wxTOOLKIT_VERSION VERSION_GREATER gtk_version)
+    foreach(gtk_version 2.0 2.10 2.18 2.20 3.0 3.90.0)
+        if(wxTOOLKIT_VERSION VERSION_GREATER_EQUAL gtk_version)
             if(gtk_version EQUAL 3.90.0)
                 set(__WXGTK4__ ON)
             elseif(gtk_version EQUAL 3.0)