wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: cmake: GetCompileFlags: include CMAKE_C_FLAGS (#10957)

Browse Source 
Calls `GetCompileFlags` from `src/nvim` directory, to include
`--coverage` (and any others).
This commit is contained in:
Daniel Hahler 2019-09-06 20:36:05 +02:00 committed by GitHub
parent fd4636f1b9
commit 8db62ac57d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -533,10 +533,7 @@ install_helper(
#
add_subdirectory(src/nvim)
# Read compilation flags from src/nvim, used in config subdirectory below.
include(GetCompileFlags)
get_compile_flags(NVIM_VERSION_CFLAGS)
get_directory_property(NVIM_VERSION_CFLAGS DIRECTORY src/nvim DEFINITION NVIM_VERSION_CFLAGS)
add_subdirectory(test/includes)
add_subdirectory(config)
add_subdirectory(test/functional/fixtures) # compile test programs

12
cmake/GetCompileFlags.cmake
View File

@ -10,9 +10,7 @@ function(get_compile_flags _compile_flags)
"${compile_flags}")
# Get flags set by add_definitions().
get_directory_property(compile_definitions
DIRECTORY "src/nvim"
COMPILE_DEFINITIONS)
get_property(compile_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
get_target_property(compile_definitions_target nvim COMPILE_DEFINITIONS)
if(compile_definitions_target)
list(APPEND compile_definitions ${compile_definitions_target})
@ -30,9 +28,7 @@ function(get_compile_flags _compile_flags)
"${compile_flags}")
# Get flags set by add_compile_options().
get_directory_property(compile_options
DIRECTORY "src/nvim"
COMPILE_OPTIONS)
get_property(compile_options DIRECTORY PROPERTY COMPILE_OPTIONS)
get_target_property(compile_options_target nvim COMPILE_OPTIONS)
if(compile_options_target)
list(APPEND compile_options ${compile_options_target})
@ -62,9 +58,7 @@ function(get_compile_flags _compile_flags)
"${compile_flags}")
# Get include directories.
get_directory_property(include_directories_list
DIRECTORY "src/nvim"
INCLUDE_DIRECTORIES)
get_property(include_directories_list DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
list(REMOVE_DUPLICATES include_directories_list)
foreach(include_directory ${include_directories_list})
set(include_directories "${include_directories} -I${include_directory}")

3
src/nvim/CMakeLists.txt
View File

@ -679,3 +679,6 @@ add_custom_target(generated-sources DEPENDS
)
add_subdirectory(po)
include(GetCompileFlags)
get_compile_flags(NVIM_VERSION_CFLAGS)