diff --git a/Auxiliary/bash-completion/cmake b/Auxiliary/bash-completion/cmake
index bed7248f70..e673894b22 100644
--- a/Auxiliary/bash-completion/cmake
+++ b/Auxiliary/bash-completion/cmake
@@ -2,14 +2,18 @@
 
 _cmake()
 {
-    local cur prev words cword split=false
+    local is_old_completion=false
+
+    local cur prev words cword split
     if type -t _init_completion >/dev/null; then
-        _init_completion -n = || return
+        _init_completion -s || return
     else
         # manual initialization for older bash completion versions
         COMPREPLY=()
         cur="${COMP_WORDS[COMP_CWORD]}"
         prev="${COMP_WORDS[COMP_CWORD-1]}"
+        is_old_completion=true
+        split=false
     fi
 
     # Workaround for options like -DCMAKE_BUILD_TYPE=Release
@@ -89,7 +93,9 @@ _cmake()
             ;;
     esac
 
-    _split_longopt && split=true
+    if $is_old_completion; then
+        _split_longopt && split=true
+    fi
 
     case "$prev" in
         -C|-P|--graphviz|--system-information)