aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-11 01:32:35 +0300
committerZyX <kp-pav@yandex.ru>2017-04-11 01:32:35 +0300
commit0c5e359cb502cc858892930bcc8dbfadcdf09bd3 (patch)
treece84c923890437573528d110934f5a9f9d3c16dd /src
parent9cad5155e3dd44d2b767f0889fdb66231208603d (diff)
downloadrneovim-0c5e359cb502cc858892930bcc8dbfadcdf09bd3.tar.gz
rneovim-0c5e359cb502cc858892930bcc8dbfadcdf09bd3.tar.bz2
rneovim-0c5e359cb502cc858892930bcc8dbfadcdf09bd3.zip
cmake: Append lua include also to single-includes targets
Diffstat (limited to 'src')
-rw-r--r--src/nvim/CMakeLists.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 1401029cf5..7111e4aa81 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -358,12 +358,12 @@ target_link_libraries(nvim ${NVIM_EXEC_LINK_LIBRARIES})
install_helper(TARGETS nvim)
if(PREFER_LUAJIT)
- set_property(TARGET nvim APPEND PROPERTY
- INCLUDE_DIRECTORIES ${LUAJIT_INCLUDE_DIRS})
+ set(LUA_PREFERRED_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIRS})
else()
- set_property(TARGET nvim APPEND PROPERTY
- INCLUDE_DIRECTORIES ${LUA_INCLUDE_DIRS})
+ set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIRS})
endif()
+set_property(TARGET nvim APPEND PROPERTY
+ INCLUDE_DIRECTORIES ${LUA_PREFERRED_INCLUDE_DIRS})
if(WIN32)
# Copy DLLs and third-party tools to bin/ and install them along with nvim
@@ -540,6 +540,10 @@ foreach(hfile ${NVIM_HEADERS})
${texe}
EXCLUDE_FROM_ALL
${tsource} ${NVIM_HEADERS} ${NVIM_GENERATED_FOR_HEADERS})
+ set_property(
+ TARGET ${texe}
+ APPEND PROPERTY INCLUDE_DIRECTORIES ${LUA_PREFERRED_INCLUDE_DIRS}
+ )
list(FIND NO_SINGLE_CHECK_HEADERS "${relative_path}" hfile_exclude_idx)
if(${hfile_exclude_idx} EQUAL -1)