Skip to content

Add CMake config using pkg-config internally #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 6, 2019
Merged

Add CMake config using pkg-config internally #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f40ac10
WIP: Add CMake config generation
wxmerkt Oct 25, 2019
e5c6af8
[cmake] Sync submodule
wxmerkt Nov 4, 2019
6f0d3fc
Use Olivier's suggestions to export include directories
wxmerkt Nov 4, 2019
7854c0f
Install eigenpyConfig.cmake for catkin backwards compatibility to fix…
wxmerkt Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ FIND_NUMPY()
INCLUDE_DIRECTORIES(SYSTEM ${NUMPY_INCLUDE_DIRS})

# ----------------------------------------------------
# --- DEPENDANCIES -----------------------------------
# --- DEPENDENCIES -----------------------------------
# ----------------------------------------------------
ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")

Expand Down Expand Up @@ -140,6 +140,9 @@ TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj
TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME})
PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
INSTALL(TARGETS ${PROJECT_NAME}
EXPORT ${TARGETS_EXPORT_NAME}
PUBLIC_HEADER
INCLUDES DESTINATION ${CMAKE_INSTALL_PREFIX}/include
LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
Expand All @@ -150,10 +153,17 @@ ADD_SOURCE_GROUP(${PROJECT_NAME}_SOURCES)
INCLUDE(GenerateExportHeader)
GENERATE_EXPORT_HEADER(${PROJECT_NAME} EXPORT_FILE_NAME eigenpy/${PROJECT_NAME}_export.h)
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})

INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/eigenpy/${PROJECT_NAME}_export.h
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 ---------------------------------
# ----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cmake
Open in desktop
Submodule cmake updated 18 files
+5 −0 .docs/pages/other.rst
+7 −7 boost.cmake
+359 −0 cython/cython.cmake
+0 −0 cython/dummy.cpp
+224 −0 cython/python/FindPython.cmake
+1,324 −0 cython/python/FindPython/Support.cmake
+189 −0 cython/python/FindPython2.cmake
+189 −0 cython/python/FindPython3.cmake
+6 −0 cython/python/README.md
+102 −0 cython/setup.in.py
+1 −1 deprecated.hh.cmake
+39 −2 dynamic_graph/python-module-py.cc
+7 −3 dynamic_graph/submodule/__init__.py.cmake
+3 −0 msvc-specific.cmake
+1 −1 msvc.vcxproj.user.in
+21 −12 python.cmake
+4 −4 sphinx.cmake
+31 −10 version.cmake
6 changes: 6 additions & 0 deletions eigenpyConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
cmake_minimum_required(VERSION 2.8.3)

message(STATUS "Loading eigenpy from PkgConfig")

find_package(PkgConfig)
pkg_check_modules(eigenpy REQUIRED eigenpy)