fix: avoiding double nested include directories for PUBLIC_INCLUDES

aminya · Feb 13, 2022 · 8893c6b · 8893c6b
1 parent 7b4bd41
commit 8893c6b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -13,6 +13,7 @@ Checks: "*,
  -readability-avoid-const-params-in-decls,
  -cppcoreguidelines-non-private-member-variables-in-classes,
  -misc-non-private-member-variables-in-classes,
+ -misc-definitions-in-headers,
 "
 WarningsAsErrors: ''
 HeaderFilterRegex: ''

diff --git a/src/PackageProject.cmake b/src/PackageProject.cmake
@@ -80,13 +80,24 @@ function(package_project)
  STREQUAL
  "")
  foreach(_INC ${_PackageProject_PUBLIC_INCLUDES})
+ # make include absolute
  if(NOT IS_ABSOLUTE ${_INC})
  set(_INC "${CMAKE_CURRENT_SOURCE_DIR}/${_INC}")
  endif()
+ # install include
  if(IS_DIRECTORY ${_INC})
- install(DIRECTORY ${_INC} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+
+ # strip double include directories
+ if("${CMAKE_INSTALL_INCLUDEDIR}" STREQUAL "include" AND "${_INC}" MATCHES ".*[/\\]include[/\\]?")
+ message(STATUS "package_project: avoiding double nested `include` directories for PUBLIC_INCLUDES")
+ set(_CMAKE_INSTALL_INCLUDEDIR "")
+ else()
+ set(_CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+ endif()
+
+ install(DIRECTORY ${_INC} DESTINATION ${CMAKE_INSTALL_PREFIX}/${_CMAKE_INSTALL_INCLUDEDIR})
  else()
- install(FILES ${_INC} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+ install(FILES ${_INC} DESTINATION ${CMAKE_INSTALL_PREFIX}/${_CMAKE_INSTALL_INCLUDEDIR})
  endif()
  endforeach()
  endif()

diff --git a/test/include/mylib/lib.hpp b/test/include/mylib/lib.hpp
@@ -1,3 +1,5 @@
+#pragma once
+
 // test external pac
 #include <Eigen/Dense>
 #include <fmt/core.h>