Skip to content

Commit 7854c0f

Browse files
committed
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
1 parent 6f0d3fc commit 7854c0f

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
88
SET(PROJECT_NAME eigenpy)
99
SET(PROJECT_DESCRIPTION "Bindings between Numpy and Eigen using Boost.Python")
1010
SET(PROJECT_URL "http://github.com/stack-of-tasks/eigenpy")
11-
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
1211

1312
# Check if the submodule cmake have been initialized
1413
IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake")
@@ -159,6 +158,12 @@ SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})
159158
INSTALL(FILES
160159
${CMAKE_CURRENT_BINARY_DIR}/eigenpy/${PROJECT_NAME}_export.h
161160
DESTINATION include/eigenpy)
161+
162+
# This is a temporary work-around to fix MoveIt until jrl-cmakemodules
163+
# can correctly create non-target CMake configs
164+
install(FILES eigenpyConfig.cmake DESTINATION share/eigenpy/cmake)
165+
install(FILES package.xml DESTINATION share/eigenpy)
166+
162167
# ----------------------------------------------------
163168
# --- PYTHON LIBRARY ---------------------------------
164169
# ----------------------------------------------------
@@ -173,5 +178,3 @@ PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
173178
PKG_CONFIG_APPEND_CFLAGS("-I${PYTHON_INCLUDE_DIRS}")
174179
PKG_CONFIG_APPEND_CFLAGS("-I${NUMPY_INCLUDE_DIRS}")
175180
PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_COMPONENTS})
176-
177-
SETUP_PROJECT_PACKAGE_FINALIZE()

eigenpyConfig.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
cmake_minimum_required(VERSION 2.8.3)
2+
3+
message(STATUS "Loading eigenpy from PkgConfig")
4+
5+
find_package(PkgConfig)
6+
pkg_check_modules(eigenpy REQUIRED eigenpy)

0 commit comments

Comments
 (0)