From 8db62ac57d230ee7c528e09c88ae0a2a52c5b5f2 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 6 Sep 2019 20:36:05 +0200 Subject: build: cmake: GetCompileFlags: include CMAKE_C_FLAGS (#10957) Calls `GetCompileFlags` from `src/nvim` directory, to include `--coverage` (and any others). --- cmake/GetCompileFlags.cmake | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'cmake/GetCompileFlags.cmake') diff --git a/cmake/GetCompileFlags.cmake b/cmake/GetCompileFlags.cmake index 667b97350c..2238744a66 100644 --- a/cmake/GetCompileFlags.cmake +++ b/cmake/GetCompileFlags.cmake @@ -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}") -- cgit