Skip to content

Commit cdea5a8

Browse files
authored
Merge pull request #101 from wxmerkt/wxm-add-cmake
Add CMake config using pkg-config internally
2 parents 42b47bf + 7854c0f commit cdea5a8

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

CMakeLists.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ FIND_NUMPY()
6565
INCLUDE_DIRECTORIES(SYSTEM ${NUMPY_INCLUDE_DIRS})
6666

6767
# ----------------------------------------------------
68-
# --- DEPENDANCIES -----------------------------------
68+
# --- DEPENDENCIES -----------------------------------
6969
# ----------------------------------------------------
7070
ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")
7171

@@ -140,6 +140,9 @@ TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj
140140
TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME})
141141
PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
142142
INSTALL(TARGETS ${PROJECT_NAME}
143+
EXPORT ${TARGETS_EXPORT_NAME}
144+
PUBLIC_HEADER
145+
INCLUDES DESTINATION ${CMAKE_INSTALL_PREFIX}/include
143146
LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
144147
ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
145148
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
@@ -150,10 +153,17 @@ ADD_SOURCE_GROUP(${PROJECT_NAME}_SOURCES)
150153
INCLUDE(GenerateExportHeader)
151154
GENERATE_EXPORT_HEADER(${PROJECT_NAME} EXPORT_FILE_NAME eigenpy/${PROJECT_NAME}_export.h)
152155
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
156+
SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})
153157

154158
INSTALL(FILES
155159
${CMAKE_CURRENT_BINARY_DIR}/eigenpy/${PROJECT_NAME}_export.h
156160
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+
157167
# ----------------------------------------------------
158168
# --- PYTHON LIBRARY ---------------------------------
159169
# ----------------------------------------------------

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)