diff options
| author | John Szakmeister <john@szakmeister.net> | 2015-04-03 04:57:44 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2015-04-03 04:57:44 -0400 |
| commit | ab026375923feb2e98d0d7bb3c10ded6aaf07ff0 (patch) | |
| tree | 767170b8790076a1fcb16ec58558074864c53de4 | |
| parent | dfdc6a76b1eaf7542e0ed96244c610cf61ea2594 (diff) | |
| parent | 80e80e467f7366ebbce64c610a940cae97e53ee5 (diff) | |
| download | rneovim-ab026375923feb2e98d0d7bb3c10ded6aaf07ff0.tar.gz rneovim-ab026375923feb2e98d0d7bb3c10ded6aaf07ff0.tar.bz2 rneovim-ab026375923feb2e98d0d7bb3c10ded6aaf07ff0.zip | |
Merge pull request #2318 from yshui/master
CMakeLists: fix build when there're multiple arguments in C_FLAGS
| -rw-r--r-- | src/nvim/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 92fbc0c8c9..47782e8b6b 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -106,7 +106,9 @@ foreach(gen_include ${gen_includes}) list(APPEND gen_cflags "-I${gen_include}") endforeach() string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) -set(gen_cflags "${gen_cflags} ${CMAKE_C_FLAGS_${build_type}} ${CMAKE_C_FLAGS}") +separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) +separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) +set(gen_cflags ${gen_cflags} ${C_FLAGS_${build_type}_ARRAY} ${C_FLAGS_ARRAY}) foreach(sfile ${NEOVIM_SOURCES} "${PROJECT_SOURCE_DIR}/src/nvim/regexp_nfa.c") @@ -121,7 +123,6 @@ foreach(sfile ${NEOVIM_SOURCES} set(gf1 "${GENERATED_DIR}/${r}.c.generated.h") set(gf2 "${GENERATED_INCLUDES_DIR}/${r}.h.generated.h") set(gf3 "${GENERATED_DIR}/${r}.i") - separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) add_custom_command( OUTPUT "${gf1}" "${gf2}" COMMAND ${CMAKE_C_COMPILER} ${sfile} -o ${gf3} ${gen_cflags} -E ${C_FLAGS_ARRAY} |