Merge branch 'master' into changes-for-pullrequest

Author: vhdirk

README.md

@@ -16,6 +16,9 @@ and whenever one is found, it runs the cmake command there, assuming the CMakeLi
 file is just one directory above. Any arguments given to :CMake will be directly passed
 on to the cmake command. It also sets the working directory of the make command, so
 you can just use quickfix as with a normal Makefile project.
+If you have the [AsyncRun plugin](https://github.com/skywind3000/asyncrun.vim)
+installed, it will be used automatically and you will be able to check the
+result of the cmake command in the quickfix as well.
 
  * `:CMakeClean` deletes all files in the build directory. You can think of this as a CMake version of make clean.
 

doc/cmake.txt

@@ -47,6 +47,8 @@ g:cmake_build_dir                set the cmake 'build' directory, default: 'buil
 g:cmake_project_generator        set project generator, however, this will have
                                  no effect until you run :CMakeClean and :CMake.
 
+g:cmake_usr_args                 custom user arguments. Ex: 'let g:cmake_usr_args="-DDEBUG=YES"'
+
 b:build_dir                      the path to the cmake build directory for the current buffer.
                                  This variable is set with the first :CMake or :CMakeFindBuildDir call.
                                  Once found, it will not be searched for again unless you call
@@ -62,3 +64,4 @@ g:cmake_export_compile_commands  same as -DCMAKE_EXPORT_COMPILE_COMMANDS=ON, use
 
 g:cmake_ycm_symlinks             create a symlink to the compile_commands.json file in the
                                  root of the project (build/..) if the file is found.
+

plugin/cmake.vim

@@ -84,7 +84,10 @@ function! s:cmake_configure()
     if exists("g:cmake_c_compiler")
         let l:argument += [ "-DCMAKE_C_COMPILER:FILEPATH="       . g:cmake_c_compiler ]
     endif
-  endif
+
+    if exists("g:cmake_usr_args")
+      let l:argument+= [ g:cmake_usr_args ]
+    endif
 
   if exists("g:cmake_install_prefix")
     let l:argument += [ "-DCMAKE_INSTALL_PREFIX:FILEPATH="  . g:cmake_install_prefix ]