Merge pull request #132 from jcarpent/devel

Improve packaging and export of the project

Author: jcarpent

.travis.yml

@@ -54,8 +54,15 @@ before_install: ./.travis/run before_install
 install: pip install coveralls numpy
 script:
   - export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE}"
-  - sudo free -m -t
-  - ls -l /usr/lib/x86_64-linux-gnu/libboost_python*
   - ./.travis/run ../travis_custom/custom_build
+  - cd $TRAVIS_BUILD_DIR/unittest/cmake
+  - mkdir build
+  - cd build
+  - export CMAKE_PREFIX_PATH=/tmp/_ci/install
+  - cmake ..
+  - make
+  - ./extra_lib
+  - cd /tmp/_ci/build
+  - make uninstall 
 after_failure: ./.travis/run after_failure
 after_success: ./.travis/run after_success

CMakeLists.txt

@@ -9,6 +9,7 @@ SET(PROJECT_NAME eigenpy)
 SET(PROJECT_DESCRIPTION "Bindings between Numpy and Eigen using Boost.Python")
 SET(PROJECT_URL "http://github.com/stack-of-tasks/eigenpy")
 SET(PROJECT_USE_CMAKE_EXPORT TRUE)
+SET(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE)
 SET(PROJECT_CUSTOM_HEADER_EXTENSION "hpp")
 
 # Check if the submodule cmake have been initialized
@@ -102,11 +103,6 @@ LIST(APPEND ${PROJECT_NAME}_HEADERS
   ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/deprecated.hpp
   ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/warning.hpp)
 
-INCLUDE_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/include)
-INCLUDE_DIRECTORIES(${${PROJECT_NAME}_SOURCE_DIR}/include)
-
-LINK_DIRECTORIES(${PYTHON_LIBRARY_DIRS})
-
 # ----------------------------------------------------
 # --- TARGETS ----------------------------------------
 # ----------------------------------------------------
@@ -126,7 +122,14 @@ SET(${PROJECT_NAME}_SOURCES
 )
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
-TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} 
+  SYSTEM PUBLIC 
+  ${Boost_INCLUDE_DIRS} 
+  ${EIGEN3_INCLUDE_DIRS} 
+  ${PYTHON_INCLUDE_DIRS} 
+  ${NUMPY_INCLUDE_DIRS}
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
 IF(NOT WIN32)
   TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj> "-Wno-conversion")
 ELSE()
@@ -155,10 +158,6 @@ 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 package for ROS
 install(FILES package.xml DESTINATION share/eigenpy)
 

cmake

@@ -39,13 +39,13 @@ ELSE()
   SET(${PYWRAP}_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/${PROJECT_NAME})
 ENDIF()
 
-SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES SUFFIX ${PYTHON_EXT_SUFFIX})
-
-SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES
-  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}")
-
-SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
+SET_TARGET_PROPERTIES(${PYWRAP}
+  PROPERTIES 
+  PREFIX ""
+  SUFFIX ${PYTHON_EXT_SUFFIX}
+  OUTPUT_NAME "${PROJECT_NAME}"
+  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
+  )
 
 INSTALL(TARGETS ${PYWRAP} DESTINATION ${${PYWRAP}_INSTALL_DIR})
 

eigenpyConfig.cmake

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.6)
+
+project(ExtraLib CXX)
+find_package(eigenpy REQUIRED)
+find_package(PythonInterp REQUIRED)
+find_package(PythonLibs REQUIRED)
+
+add_executable(extra_lib extra_lib.cpp)
+target_link_libraries(extra_lib PUBLIC eigenpy::eigenpy ${PYTHON_LIBRARIES})

python/CMakeLists.txt

@@ -0,0 +1,8 @@
+
+#include <eigenpy/version.hpp>
+
+int main(int /*argc*/, char ** /*argv*/)
+{
+  eigenpy::checkVersionAtLeast(0,0,0);
+  return 0;
+}