Permalink
Browse files

let catkin deal with ecto_INCLUDE_DIRS

  • Loading branch information...
1 parent 4b23176 commit 1920fdae12d8bfd2359ab97414a3f12e4a4e3617 @vrabaud vrabaud committed Apr 18, 2012
Showing with 3 additions and 9 deletions.
  1. +0 −1 cmake/config.cmake
  2. +0 −2 cmake/ecto-extras.cmake.in
  3. +0 −1 cmake/ectoInstall.cmake
  4. +3 −5 test/cpp/CMakeLists.txt
View
@@ -28,7 +28,6 @@
set(ecto_CONFIG_DIR ${CMAKE_BINARY_DIR}/cmake/ecto)
set(ecto_PYTHONPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${ecto_SOURCE_DIR}/python)
-set(ecto_INCLUDE_DIRS ${ecto_SOURCE_DIR}/include ${ecto_BINARY_DIR}/include)
set(ecto_PYTHONLIB ecto_ectomodule)
set(ECTO_CONFIG_PATH ${CMAKE_BINARY_DIR}/cmake/ecto)
@@ -13,7 +13,6 @@
#
# This file will define the following variables:
# - ecto_LIBRARIES : The list of libraries to link against.
-# - ecto_INCLUDE_DIRS : The ecto include directories
# These macros:
# set_ecto_install_package_name(package_name) #default is "" you may specify other
# ectomodule(module_name ${srcs}) #This creates a single ecto module
@@ -27,7 +26,6 @@ include(${SELF_DIR}/ectoMacros.cmake)
include(${SELF_DIR}/rosbuild_lite.cmake)
include(${SELF_DIR}/doc.cmake)
include(${SELF_DIR}/git.cmake)
-set(ecto_INCLUDE_DIRS @ecto_INCLUDE_DIRS@)
set(ECTO_CONFIG_PATH ${SELF_DIR})
set(ecto_PYTHONPATH @ecto_PYTHONPATH@)
set(ecto_PYTHONLIB @ecto_PYTHONLIB@)
View
@@ -28,7 +28,6 @@
#### install stuff #####
#create an ectoConfig.cmake for easy find_package(ecto)
-set(ecto_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/${include_prefix})
set(ecto_LIBRARIES_DIR ${CMAKE_INSTALL_PREFIX}/lib)
set(ecto_PYTHONPATH ${CMAKE_INSTALL_PREFIX}/${ecto_PYTHON_INSTALL})
set(ECTO_CONFIG_PATH ${CMAKE_INSTALL_PREFIX}/${share_prefix})
View
@@ -32,11 +32,9 @@ if(NOT GTEST_FOUND)
return()
endif()
-include_directories(
- ${GTEST_INCLUDE_DIRS}
- ${ecto_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_PATH}
- ${Boost_INCLUDE_DIRS}
+include_directories(SYSTEM ${GTEST_INCLUDE_DIRS}
+ ${PYTHON_INCLUDE_PATH}
+ ${Boost_INCLUDE_DIRS}
)
add_executable(ecto-test

0 comments on commit 1920fda

Please sign in to comment.