diff --git a/after/ftplugin/cmake.vim b/after/ftplugin/cmake.vim
index 36e3bd8..8f9a022 100644
--- a/after/ftplugin/cmake.vim
+++ b/after/ftplugin/cmake.vim
@@ -7,5 +7,9 @@ setlocal foldmethod=syntax
 setlocal commentstring=#%s
 
 " Custon surround for creating a CMake variable from a text object.
-" "ys{motion}v" makes a variable out of "<text-obj>" - > "${<text-obj>}"
+" "ys{motion}v" makes a variable out of "text-obj" -> "${text-obj}"
 let b:surround_{char2nr("v")} = "${\r}"
+
+" Custom surround for createing a CMake generator expression from a test object.
+" "ys{motion}g" makes a generator expression out of "text-obj" -> "$<text-obj>"
+let b:surround_{char2nr("g")} = "$<\r>"