aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-09-24 14:27:04 -0400
committerJames McCoy <jamessan@jamessan.com>2016-09-24 20:46:09 -0400
commit4ce24ff9da0f6551eeca2011dc9d05194bf02e12 (patch)
tree71429c5408ff4e26af9c66adf8cf8956622373cf /src
parent9e1c659666b5909b0ebb77406db42bc6892659d6 (diff)
downloadrneovim-4ce24ff9da0f6551eeca2011dc9d05194bf02e12.tar.gz
rneovim-4ce24ff9da0f6551eeca2011dc9d05194bf02e12.tar.bz2
rneovim-4ce24ff9da0f6551eeca2011dc9d05194bf02e12.zip
genunicodetables: Give the unicode directory as the first argument
Let genunicodetables determine which files it needs from the unicode directory. cmake just needs to pass the directory and destination file to the script.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/CMakeLists.txt15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 64e99fb475..59582d0734 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -36,10 +36,7 @@ set(EVAL_DEFS_FILE ${PROJECT_SOURCE_DIR}/src/nvim/eval.lua)
set(OPTIONS_LIST_FILE ${PROJECT_SOURCE_DIR}/src/nvim/options.lua)
set(UNICODE_TABLES_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/genunicodetables.lua)
set(UNICODE_DIR ${PROJECT_SOURCE_DIR}/unicode)
-set(UNICODEDATA_FILE ${UNICODE_DIR}/UnicodeData.txt)
-set(CASEFOLDING_FILE ${UNICODE_DIR}/CaseFolding.txt)
-set(EASTASIANWIDTH_FILE ${UNICODE_DIR}/EastAsianWidth.txt)
-set(EMOJI_FILE ${UNICODE_DIR}/emoji-data.txt)
+file(GLOB UNICODE_FILES ${UNICODE_DIR}/*.txt)
set(GENERATED_UNICODE_TABLES ${GENERATED_DIR}/unicode_tables.generated.h)
include_directories(${GENERATED_DIR})
@@ -193,17 +190,11 @@ endforeach()
add_custom_command(OUTPUT ${GENERATED_UNICODE_TABLES}
COMMAND ${LUA_PRG} ${UNICODE_TABLES_GENERATOR}
- ${UNICODEDATA_FILE}
- ${CASEFOLDING_FILE}
- ${EASTASIANWIDTH_FILE}
- ${EMOJI_FILE}
+ ${UNICODE_DIR}
${GENERATED_UNICODE_TABLES}
DEPENDS
${UNICODE_TABLES_GENERATOR}
- ${UNICODEDATA_FILE}
- ${CASEFOLDING_FILE}
- ${EASTASIANWIDTH_FILE}
- ${EMOJI_FILE}
+ ${UNICODE_FILES}
)
add_custom_command(OUTPUT ${GENERATED_API_DISPATCH} ${API_METADATA}