Commit 7854c0fc authored by Wolfgang Merkt's avatar Wolfgang Merkt
Browse files

Install eigenpyConfig.cmake for catkin backwards compatibility to fix MoveIt

- MoveIt cannot make a new release right now with our bugfix due to people constraints
- We cannot roll back due to project constraints
- This adds a cmake config that internally uses the pkg-config. This will be replaced in the future with one with proper CMake targets
parent 6f0d3fc3
...@@ -8,7 +8,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ...@@ -8,7 +8,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(PROJECT_NAME eigenpy) SET(PROJECT_NAME eigenpy)
SET(PROJECT_DESCRIPTION "Bindings between Numpy and Eigen using Boost.Python") SET(PROJECT_DESCRIPTION "Bindings between Numpy and Eigen using Boost.Python")
SET(PROJECT_URL "http://github.com/stack-of-tasks/eigenpy") SET(PROJECT_URL "http://github.com/stack-of-tasks/eigenpy")
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
# Check if the submodule cmake have been initialized # Check if the submodule cmake have been initialized
IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake") IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake")
...@@ -159,6 +158,12 @@ SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS}) ...@@ -159,6 +158,12 @@ SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})
INSTALL(FILES INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/eigenpy/${PROJECT_NAME}_export.h ${CMAKE_CURRENT_BINARY_DIR}/eigenpy/${PROJECT_NAME}_export.h
DESTINATION include/eigenpy) DESTINATION include/eigenpy)
# This is a temporary work-around to fix MoveIt until jrl-cmakemodules
# can correctly create non-target CMake configs
install(FILES eigenpyConfig.cmake DESTINATION share/eigenpy/cmake)
install(FILES package.xml DESTINATION share/eigenpy)
# ---------------------------------------------------- # ----------------------------------------------------
# --- PYTHON LIBRARY --------------------------------- # --- PYTHON LIBRARY ---------------------------------
# ---------------------------------------------------- # ----------------------------------------------------
...@@ -173,5 +178,3 @@ PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME}) ...@@ -173,5 +178,3 @@ PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
PKG_CONFIG_APPEND_CFLAGS("-I${PYTHON_INCLUDE_DIRS}") PKG_CONFIG_APPEND_CFLAGS("-I${PYTHON_INCLUDE_DIRS}")
PKG_CONFIG_APPEND_CFLAGS("-I${NUMPY_INCLUDE_DIRS}") PKG_CONFIG_APPEND_CFLAGS("-I${NUMPY_INCLUDE_DIRS}")
PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_COMPONENTS}) PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_COMPONENTS})
SETUP_PROJECT_PACKAGE_FINALIZE()
cmake_minimum_required(VERSION 2.8.3)
message(STATUS "Loading eigenpy from PkgConfig")
find_package(PkgConfig)
pkg_check_modules(eigenpy REQUIRED eigenpy)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment