From 895f1d61b485c52bc41a5fb62fac541e8e2aaf7c Mon Sep 17 00:00:00 2001 From: gaschler Date: Tue, 10 Apr 2018 15:14:59 +0200 Subject: [PATCH] Glob only files in cartographer/ (#1048) FIXES=#1044 --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b47b40f..ecb0670 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,10 +57,10 @@ install(DIRECTORY configuration_files DESTINATION share/cartographer/) install(DIRECTORY cmake DESTINATION share/cartographer/) -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") +file(GLOB_RECURSE ALL_LIBRARY_HDRS "cartographer/*.h") +file(GLOB_RECURSE ALL_LIBRARY_SRCS "cartographer/*.cc") +file(GLOB_RECURSE ALL_TESTS "cartographer/*_test.cc") +file(GLOB_RECURSE ALL_EXECUTABLES "cartographer/*_main.cc") # Remove dotfiles/-folders that could potentially pollute the build. file(GLOB_RECURSE ALL_DOTFILES ".*/*") @@ -92,8 +92,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 "cartographer*/*.proto") -file(GLOB_RECURSE ALL_GRPC_SERVICES "cartographer*/*_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})