From 7e05daa8ca2bb4e51b3eaf449f4b6901a97a97f6 Mon Sep 17 00:00:00 2001 From: Michael Grupp Date: Tue, 6 Mar 2018 18:39:46 +0100 Subject: [PATCH] Remove dotfiles from build files in CMakeLists.txt (#897) Avoids including unwanted files that could appear in a developer workspace (e.g. auto-generated files in "dot" folders). --- CMakeLists.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c57e25..8567ca0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,16 @@ file(GLOB_RECURSE ALL_LIBRARY_HDRS "*.h") file(GLOB_RECURSE ALL_LIBRARY_SRCS "*.cc") file(GLOB_RECURSE ALL_TESTS "*_test.cc") file(GLOB_RECURSE ALL_EXECUTABLES "*_main.cc") + +# Remove dotfiles/-folders that could potentially pollute the build. +file(GLOB_RECURSE ALL_DOTFILES ".*/*") +if (ALL_DOTFILES) + list(REMOVE_ITEM ALL_LIBRARY_HDRS ${ALL_DOTFILES}) + list(REMOVE_ITEM ALL_LIBRARY_SRCS ${ALL_DOTFILES}) + list(REMOVE_ITEM ALL_TESTS ${ALL_DOTFILES}) + list(REMOVE_ITEM ALL_EXECUTABLES ${ALL_DOTFILES}) +endif() + list(REMOVE_ITEM ALL_LIBRARY_SRCS ${ALL_TESTS}) list(REMOVE_ITEM ALL_LIBRARY_SRCS ${ALL_EXECUTABLES}) file(GLOB_RECURSE ALL_GRPC_FILES "cartographer/cloud/*") @@ -78,8 +88,8 @@ set(INSTALL_SOURCE_HDRS ${ALL_LIBRARY_HDRS}) file(GLOB_RECURSE INTERNAL_HDRS "cartographer/*/internal/*.h") list(REMOVE_ITEM INSTALL_SOURCE_HDRS ${INTERNAL_HDRS}) -file(GLOB_RECURSE ALL_PROTOS "*.proto") -file(GLOB_RECURSE ALL_GRPC_SERVICES "*_service.proto") +file(GLOB_RECURSE ALL_PROTOS "cartographer*/*.proto") +file(GLOB_RECURSE ALL_GRPC_SERVICES "cartographer*/*_service.proto") list(REMOVE_ITEM ALL_PROTOS ALL_GRPC_SERVICES) if (NOT ${BUILD_GRPC}) list(REMOVE_ITEM ALL_PROTOS ${ALL_GRPC_FILES})