Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Behave better in multi-project cmake #198

Merged
merged 1 commit into from
Nov 16, 2019
Merged

Behave better in multi-project cmake #198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ament_cmake_cppcheck/cmake/ament_cmake_cppcheck_lint_hook.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if(_source_files)

# BUILDSYSTEM_TARGETS only supported in CMake >= 3.7
if(NOT CMAKE_VERSION VERSION_LESS "3.7.0")
get_directory_property(_build_targets DIRECTORY ${CMAKE_SOURCE_DIR} BUILDSYSTEM_TARGETS)
get_directory_property(_build_targets DIRECTORY ${PROJECT_SOURCE_DIR} BUILDSYSTEM_TARGETS)
foreach(_target ${_build_targets})
# Include directories property is different for INTERFACE libraries
get_target_property(_target_type ${_target} TYPE)
Expand All @@ -50,12 +50,12 @@ if(_source_files)
# 1. Reduces execution time (less include directories to search)
# 2. cppcheck will not check for errors in external packages
foreach(_include_dir ${_include_dirs})
# TODO(jacobperron): Escape special regex characters in CMAKE_SOURCE_DIR
# TODO(jacobperron): Escape special regex characters in PROJECT_SOURCE_DIR
# Related CMake feature request: https://gitlab.kitware.com/cmake/cmake/issues/18409
# Check if include directory is a subdirectory of the source directory
string(REGEX MATCH "^${CMAKE_SOURCE_DIR}/.*" _is_subdirectory ${_include_dir})
string(REGEX MATCH "^${PROJECT_SOURCE_DIR}/.*" _is_subdirectory ${_include_dir})
# Check if include directory is part of a generator expression (e.g. $<BUILD_INTERFACE:...>)
string(REGEX MATCH "^\\$<.*:${CMAKE_SOURCE_DIR}/.*>$" _is_genexp_subdirectory "${_include_dir}")
string(REGEX MATCH "^\\$<.*:${PROJECT_SOURCE_DIR}/.*>$" _is_genexp_subdirectory "${_include_dir}")
if(_is_subdirectory OR _is_genexp_subdirectory)
list_append_unique(_all_include_dirs ${_include_dir})
endif()
Expand Down