mirror of
https://github.com/neovim/neovim.git
synced 2024-09-17 20:58:20 -04:00
Changed binary output directory from src/ to bin/
This commit is contained in:
parent
1df4ec2097
commit
be3ce617c7
@ -21,5 +21,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/.deps/usr/include")
|
||||
|
||||
include_directories ("${PROJECT_BINARY_DIR}/config")
|
||||
|
||||
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(config)
|
||||
|
6
Makefile
6
Makefile
@ -1,9 +1,9 @@
|
||||
CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug
|
||||
|
||||
build/src/vim: deps
|
||||
build/bin/vim: deps
|
||||
cd build && make
|
||||
|
||||
test: build/src/vim
|
||||
test: build/bin/vim
|
||||
cd src/testdir && make
|
||||
|
||||
deps: .deps/usr/lib/libuv.a
|
||||
@ -23,4 +23,4 @@ clean:
|
||||
|
||||
.PHONY: test deps cmake
|
||||
|
||||
.DEFAULT: build/src/vim
|
||||
.DEFAULT: build/bin/vim
|
||||
|
@ -127,7 +127,7 @@ CHECKFILES = \
|
||||
|
||||
PACKAGE = vim
|
||||
SHELL = /bin/sh
|
||||
VIM = ../../build/src/vim
|
||||
VIM = ../../build/bin/vim
|
||||
|
||||
# The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext
|
||||
# tools 0.10.37, which use a slightly different .po file format that is not
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Makefile to run all tests for Vim
|
||||
#
|
||||
|
||||
VIMPROG = ../../build/src/vim
|
||||
VIMPROG = ../../build/bin/vim
|
||||
|
||||
# Uncomment this line to use valgrind for memory leaks and extra warnings.
|
||||
# The output goes into a file "valgrind.testN"
|
||||
|
@ -456,7 +456,7 @@ function! ExtraVim(...)
|
||||
" messing up the user's viminfo file.
|
||||
let redirect = a:0 ?
|
||||
\ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
|
||||
exec "!echo '" . debug_quits . "q' | ../../build/src/vim -u NONE -N -Xes" . redirect .
|
||||
exec "!echo '" . debug_quits . "q' | ../../build/bin/vim -u NONE -N -Xes" . redirect .
|
||||
\ " -c 'debuggreedy|set viminfo+=nviminfo'" .
|
||||
\ " -c 'let ExtraVimBegin = " . extra_begin . "'" .
|
||||
\ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .
|
||||
|
Loading…
Reference in New Issue
Block a user