Skip to content

Commit

Permalink
Merge pull request #880 from ros/fix_warning_condition
Browse files Browse the repository at this point in the history
fix warning in case devel space is nested in the build space
  • Loading branch information
dirk-thomas authored Jul 24, 2017
2 parents 8495103 + 3dafd63 commit bf4f90b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmake/catkin_package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ function(_catkin_package)
string_starts_with("${idir}/" "${CATKIN_DEVEL_PREFIX}/" _is_devel_prefix)
if(_is_source_prefix OR _is_build_prefix OR _is_devel_prefix)
# generated header files should be places in the devel space rather then in the build space
if(_is_build_prefix)
if(_is_build_prefix AND NOT _is_devel_prefix)
message(WARNING "catkin_package() include dir '${idir}' should be placed in the devel space instead of the build space")
endif()
# the value doesn't matter as long as it doesn't match IS_ABSOLUTE
Expand Down

0 comments on commit bf4f90b

Please sign in to comment.