Merge pull request #2923 from UAVenture/cmake-2

Remove var for relative include directories
This commit is contained in:
Lorenz Meier
2015-09-28 17:00:02 +02:00
+7 -7
View File
@@ -128,15 +128,15 @@ catkin_package(
## Your package locations should be listed before other locations ## Your package locations should be listed before other locations
include_directories( include_directories(
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/src/platforms src/platforms
${CMAKE_SOURCE_DIR}/src/platforms/ros/px4_messages src/platforms/ros/px4_messages
${CMAKE_SOURCE_DIR}/src/include src/include
${CMAKE_SOURCE_DIR}/src/modules src/modules
${CMAKE_BINARY_DIR}/src/modules ${CMAKE_BINARY_DIR}/src/modules
${CMAKE_SOURCE_DIR}/src/ src/
${CMAKE_SOURCE_DIR}/src/lib src/lib
${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/integrationtests integrationtests
) )
## generate multiplatform wrapper headers ## generate multiplatform wrapper headers