diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-06-22 00:06:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 00:06:35 +0200 |
| commit | 04592759faa1ca34ceef6ee952f2f243e132d476 (patch) | |
| tree | 34e59fc71eed5fdcdb89ad00d0c4779ef9165c8f | |
| parent | e3b51d584266100d423d46059bd80d0789c61118 (diff) | |
| parent | 230cb00cc598ae66f0be1ca7a9c0f42976b90255 (diff) | |
| download | rneovim-04592759faa1ca34ceef6ee952f2f243e132d476.tar.gz rneovim-04592759faa1ca34ceef6ee952f2f243e132d476.tar.bz2 rneovim-04592759faa1ca34ceef6ee952f2f243e132d476.zip | |
Merge pull request #19043 from dundargoc/cmake
build(cmake): use glob_wrapper instead of file(GLOB ...) in main CMakeLists
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index f465d911f9..37f3aa1a23 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -82,10 +82,10 @@ set(LINT_SUPPRESSES_ARCHIVE ${LINT_SUPPRESSES_ROOT}/errors.tar.gz) set(LINT_SUPPRESSES_TOUCH_FILE "${TOUCHES_DIR}/unpacked-clint-errors-archive") set(LINT_SUPPRESSES_INSTALL_SCRIPT "${PROJECT_SOURCE_DIR}/cmake/InstallClintErrors.cmake") -file(GLOB UNICODE_FILES ${UNICODE_DIR}/*.txt) -file(GLOB API_HEADERS api/*.h) +glob_wrapper(UNICODE_FILES ${UNICODE_DIR}/*.txt) +glob_wrapper(API_HEADERS api/*.h) list(REMOVE_ITEM API_HEADERS ${CMAKE_CURRENT_LIST_DIR}/api/ui_events.in.h) -file(GLOB MSGPACK_RPC_HEADERS msgpack_rpc/*.h) +glob_wrapper(MSGPACK_RPC_HEADERS msgpack_rpc/*.h) include_directories(${GENERATED_DIR}) include_directories(${CACHED_GENERATED_DIR}) @@ -97,10 +97,10 @@ file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}) file(MAKE_DIRECTORY ${LINT_SUPPRESSES_ROOT}) file(MAKE_DIRECTORY ${LINT_SUPPRESSES_ROOT}/src) -file(GLOB NVIM_SOURCES *.c) -file(GLOB NVIM_HEADERS *.h) -file(GLOB EXTERNAL_SOURCES ../xdiff/*.c ../mpack/*.c ../cjson/*.c) -file(GLOB EXTERNAL_HEADERS ../xdiff/*.h ../mpack/*.h ../cjson/*.h) +glob_wrapper(NVIM_SOURCES *.c) +glob_wrapper(NVIM_HEADERS *.h) +glob_wrapper(EXTERNAL_SOURCES ../xdiff/*.c ../mpack/*.c ../cjson/*.c) +glob_wrapper(EXTERNAL_HEADERS ../xdiff/*.h ../mpack/*.h ../cjson/*.h) foreach(subdir os @@ -120,13 +120,13 @@ foreach(subdir file(MAKE_DIRECTORY ${GENERATED_DIR}/${subdir}) file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}/${subdir}) - file(GLOB sources ${subdir}/*.c) - file(GLOB headers ${subdir}/*.h) + glob_wrapper(sources ${subdir}/*.c) + glob_wrapper(headers ${subdir}/*.h) list(APPEND NVIM_SOURCES ${sources}) list(APPEND NVIM_HEADERS ${headers}) endforeach() -file(GLOB UNIT_TEST_FIXTURES ${PROJECT_SOURCE_DIR}/test/unit/fixtures/*.c) +glob_wrapper(UNIT_TEST_FIXTURES ${PROJECT_SOURCE_DIR}/test/unit/fixtures/*.c) # Sort file lists to ensure generated files are created in the same order from # build to build. |