Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 3 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 02, 2014
@jalcine Updated commands and utilities. 3cbdd06
@jalcine Merge branch 'release/0.3.0'
* release/0.3.0:
  Updated commands and utilities.
  Tightened use of CMake command detection.
  Dropped the need for a tailing 'if' block.
  Ensured commands were added only on CMake project buffers.
  Ensured proper setting of the makeprg.
  Made less logic jumps.
  Changed bangs on functions and added Dispatch.
  Updated plugin logic.
  I didn't even need this.
  Touched up flags.
0991dc0
@jalcine Updated files post-release. db07ef8
View
4 README.md
@@ -8,7 +8,7 @@
---
-[`cmake.vim 0.2.2`][release] is a Vim plugin that allows you to use [CMake][cmake]
+[`cmake.vim 0.3.0`][release] is a Vim plugin that allows you to use [CMake][cmake]
within Vim for your projects. **This is alpha-grade software and may turn your CMake
project into a cat-overrun Telnet session**.
@@ -100,4 +100,4 @@ firehose so follow with caution!
[jalcine]: http://jalcine.me
[vimux]: https://github.com/benmills/vimux
[site]: http://jalcine.github.io/cmake.vim
-[release]: https://github.com/jalcine/cmake.vim/tree/v0.2.2
+[release]: https://github.com/jalcine/cmake.vim/tree/v0.3.0
View
52 autoload/cmake/commands.vim
@@ -1,10 +1,9 @@
" File: autoload/cmake/commands.vim
-" Description: The "API" of cmake.vim.
+" Description: The API of 'cmake.vim'.
" Author: Jacky Alciné <me@jalcine.me>
" License: MIT
" Website: https://jalcine.github.io/cmake.vim
-" Version: 0.2.2
-" Last Modified: 2013-09-28 15:21:51 EDT
+" Version: 0.3.0
func! cmake#commands#build()
echomsg "[cmake] Building all targets..."
@@ -96,31 +95,28 @@ func! cmake#commands#set_var(variable,value)
endfunc!
function! cmake#commands#install_ex()
- if cmake#util#has_project() == 1 &&
- \ cmake#targets#for_file(fnamemodify(bufname('%'), ':p')) != 0
- command! -buffer -nargs=0 CMakeBuild
- \ :call cmake#commands#build()
- command! -buffer -nargs=0 CMakeRebuildCache
- \ :call cmake#commands#rebuild_cache()
- command! -buffer -nargs=0 CMakeClean
- \ :call cmake#commands#clean()
- command! -buffer -nargs=0 CMakeCleanBuild
- \ :call s:clean_then_build()
- command! -buffer -nargs=0 CMakeTest
- \ :call cmake#commands#test()
- command! -buffer -nargs=0 CMakeInstall
- \ :call cmake#commands#install()
- command! -buffer -nargs=0 CMakeClearBufferOpts
- \ :unlet b:cmake_binary_dir
- command! -buffer -nargs=0 CMakeBuildCurrent
- \ :call cmake#commands#build_current()
- command! -buffer -nargs=1 -complete=customlist,s:get_targets
- \ CMakeTarget :call cmake#targets#build("<args>")
- command! -buffer -nargs=1 CMakeGetVar
- \ :echo cmake#commands#get_var("<args>")
- endif
-
- command -nargs=1 -complete=dir CMakeCreateBuild
+ command! -buffer -nargs=0 CMakeBuild
+ \ :call cmake#commands#build()
+ command! -buffer -nargs=0 CMakeRebuildCache
+ \ :call cmake#commands#rebuild_cache()
+ command! -buffer -nargs=0 CMakeClean
+ \ :call cmake#commands#clean()
+ command! -buffer -nargs=0 CMakeCleanBuild
+ \ :call s:clean_then_build()
+ command! -buffer -nargs=0 CMakeTest
+ \ :call cmake#commands#test()
+ command! -buffer -nargs=0 CMakeInstall
+ \ :call cmake#commands#install()
+ command! -buffer -nargs=0 CMakeClearBufferOpts
+ \ :unlet b:cmake_binary_dir
+ command! -buffer -nargs=0 CMakeBuildCurrent
+ \ :call cmake#commands#build_current()
+ command! -buffer -nargs=1 -complete=customlist,s:get_targets
+ \ CMakeTarget :call cmake#targets#build("<args>")
+ command! -buffer -nargs=1 CMakeGetVar
+ \ :echo cmake#commands#get_var("<args>")
+
+ command! -nargs=1 -complete=dir CMakeCreateBuild
\ :call cmake#commands#create_build("<args>")
endfunc!
View
3 autoload/cmake/flags.vim
@@ -3,8 +3,7 @@
" Author: Jacky Alciné <me@jalcine.me>
" License: MIT
" Website: https://jalcine.github.io/cmake.vim
-" Version: 0.2.2
-" Last Modified: 2013-09-28 15:21:21 EDT
+" Version: 0.3.0
" TODO: Filter the flags so that we only have warnings and includes passed
" into the mix.
View
3 autoload/cmake/targets.vim
@@ -3,8 +3,7 @@
" Author: Jacky Alciné <me@jalcine.me>
" License: MIT
" Website: https://jalcine.github.io/cmake.vim
-" Version: 0.2.2
-" Last Modified: 2013-09-28 15:21:40 EDT
+" Version: 0.3.0
func! cmake#targets#build(target)
echomsg "[cmake] Building target '" . a:target . "'..."
View
4 autoload/cmake/util.vim
@@ -3,8 +3,7 @@
" Author: Jacky Alciné <me@jalcine.me>
" License: MIT
" Website: https://jalcine.github.io/cmake.vim
-" Version: 0.2.2
-" Last Modified: 2013-09-28 15:21:31 EDT
+" Version: 0.3.0
func! cmake#util#binary_dir()
if exists("b:cmake_binary_dir")
@@ -134,6 +133,7 @@ func! cmake#util#targets()
endfunc
func! cmake#util#apply_makeprg()
+ " TODO Take a copy of the old 'makeprg' and place it in 'g:oldmakeprg'
if g:cmake_set_makeprg == 1 && cmake#util#has_project() == 1
let &makeprg="make -C " . cmake#util#binary_dir()
endif
View
3 autoload/cmake/variables.vim
@@ -3,8 +3,7 @@
" Author: Jacky Alciné <me@jalcine.me>
" License: MIT
" Website: https://jalcine.github.io/cmake.vim
-" Version: 0.2.2
-" Last Modified: 2013-09-28 15:22:11 EDT
+" Version: 0.3.0
func! cmake#variables#exists(variable)
let l:val = cmake#util#read_from_cache(variable)
View
4 doc/cmake.txt
@@ -36,8 +36,8 @@ plugin goes a step further and automatically sets 'makeprg' for you to help
other tools related to Java, C++, C, Objective C or Fortan-based programming
easily invoke CMake's version of the build system.
-'cmake' version 0.1.6 provides this integration with minimal effort to the
-developer using Vim.
+'cmake' provides this integration with minimal effort to the developer using
+Vim.
2. QUICK START ~
*cmake-quickstart*
View
3 plugin/cmake.vim
@@ -3,8 +3,7 @@
" Author: Jacky Alciné <me@jalcine.me>
" License: MIT
" Website: https://jalcine.github.io/cmake.vim
-" Version: 0.2.2
-" Last Modified: 2013-09-28 19:32:47 EDT
+" Version: 0.3.0
" If we're here, don't reload man.
if exists("g:loaded_cmake")

No commit comments for this range

Something went wrong with that request. Please try again.