Merge pull request #600 from ros/allow_passing_absolute_include_dirs_…

…into_install_space

allow passing absolute INCLUDE_DIRS via catkin_package() into CMake config file in install space

cmake/catkin_package.cmake

@@ -288,12 +288,12 @@ function(_catkin_package)
     else()
       message(FATAL_ERROR "catkin_package() include dir '${idir}' is neither an absolute directory nor exists relative to '${CMAKE_CURRENT_SOURCE_DIR}'")
     endif()
-    list(APPEND PROJECT_CMAKE_CONFIG_INCLUDE_DIRS ${include})
-    list(APPEND PROJECT_PKG_CONFIG_INCLUDE_DIRS ${include})
+    list_append_unique(PROJECT_CMAKE_CONFIG_INCLUDE_DIRS ${include})
+    list_append_unique(PROJECT_PKG_CONFIG_INCLUDE_DIRS ${include})
   endforeach()
   if(PROJECT_DEPENDENCIES_INCLUDE_DIRS)
-    list(APPEND PROJECT_CMAKE_CONFIG_INCLUDE_DIRS ${PROJECT_DEPENDENCIES_INCLUDE_DIRS})
-    list(APPEND PROJECT_PKG_CONFIG_INCLUDE_DIRS ${PROJECT_DEPENDENCIES_INCLUDE_DIRS})
+    list_append_unique(PROJECT_CMAKE_CONFIG_INCLUDE_DIRS ${PROJECT_DEPENDENCIES_INCLUDE_DIRS})
+    list_append_unique(PROJECT_PKG_CONFIG_INCLUDE_DIRS ${PROJECT_DEPENDENCIES_INCLUDE_DIRS})
   endif()
 
   # prepend library path of this workspace
@@ -390,13 +390,18 @@ function(_catkin_package)
   # absolute path to include dir under install prefix if any include dir is set
   set(PROJECT_CMAKE_CONFIG_INCLUDE_DIRS "")
   set(PROJECT_PKG_CONFIG_INCLUDE_DIRS "")
-  if(NOT "${PROJECT_INCLUDE_DIRS}" STREQUAL "")
-    set(PROJECT_CMAKE_CONFIG_INCLUDE_DIRS "${CATKIN_GLOBAL_INCLUDE_DESTINATION}")
-    set(PROJECT_PKG_CONFIG_INCLUDE_DIRS "${PKG_INCLUDE_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}")
-  endif()
+  foreach(idir ${PROJECT_INCLUDE_DIRS})
+    if(IS_ABSOLUTE ${idir})
+      list_append_unique(PROJECT_CMAKE_CONFIG_INCLUDE_DIRS "${idir}")
+      list_append_unique(PROJECT_PKG_CONFIG_INCLUDE_DIRS "${idir}")
+    else()
+      list_append_unique(PROJECT_CMAKE_CONFIG_INCLUDE_DIRS "${CATKIN_GLOBAL_INCLUDE_DESTINATION}")
+      list_append_unique(PROJECT_PKG_CONFIG_INCLUDE_DIRS "${PKG_INCLUDE_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}")
+    endif()
+  endforeach()
   if(PROJECT_DEPENDENCIES_INCLUDE_DIRS)
-    list(APPEND PROJECT_CMAKE_CONFIG_INCLUDE_DIRS ${PROJECT_DEPENDENCIES_INCLUDE_DIRS})
-    list(APPEND PROJECT_PKG_CONFIG_INCLUDE_DIRS ${PROJECT_DEPENDENCIES_INCLUDE_DIRS})
+    list_append_unique(PROJECT_CMAKE_CONFIG_INCLUDE_DIRS ${PROJECT_DEPENDENCIES_INCLUDE_DIRS})
+    list_append_unique(PROJECT_PKG_CONFIG_INCLUDE_DIRS ${PROJECT_DEPENDENCIES_INCLUDE_DIRS})
   endif()
 
   # prepend library path of this workspace