@@ -6,26 +6,23 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
66
77INCLUDE (cmake/base.cmake)
88INCLUDE (cmake/boost.cmake)
9- INCLUDE (cmake/cpack.cmake)
10- INCLUDE (cmake/eigen.cmake)
119INCLUDE (cmake/python.cmake)
1210
1311SET (PROJECT_NAME eigenpy)
1412SET (PROJECT_DESCRIPTION "Wrapping Eigen3 -- numpy" )
15- SET (PROJECT_URL "http://github.com/stac -of-tasks/eigenpy" )
13+ SET (PROJECT_URL "http://github.com/stack -of-tasks/eigenpy" )
1614
1715# Disable -Werror on Unix for now.
1816SET (CXX_DISABLE_WERROR True )
1917SET (CMAKE_VERBOSE_MAKEFILE True )
2018
21- project (${PROJECT_NAME} )
2219SETUP_PROJECT()
2320STRING (REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
2421
2522# ----------------------------------------------------
2623# --- DEPENDANCIES -----------------------------------
2724# ----------------------------------------------------
28- SEARCH_FOR_EIGEN( )
25+ ADD_REQUIRED_DEPENDENCY( "eigen3 >= 3.0.5" )
2926SET (BOOST_COMPONENTS python)
3027SEARCH_FOR_BOOST()
3128set (Python_ADDITIONAL_VERSIONS 2.7)
@@ -81,6 +78,7 @@ SET(${PROJECT_NAME}_SOURCES
8178
8279ADD_LIBRARY (${PROJECT_NAME} SHARED ${${PROJECT_NAME} _SOURCES})
8380TARGET_LINK_LIBRARIES (${PROJECT_NAME} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
81+ PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
8482INSTALL (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX} /lib)
8583
8684# ----------------------------------------------------
@@ -94,14 +92,10 @@ ADD_LIBRARY(geometry SHARED unittest/geometry.cpp)
9492TARGET_LINK_LIBRARIES (geometry ${Boost_LIBRARIES} ${PROJECT_NAME} )
9593SET_TARGET_PROPERTIES (geometry PROPERTIES PREFIX "" )
9694
97- PKG_CONFIG_APPEND_CFLAGS(${_Eigen_CFLAGS} )
9895PKG_CONFIG_APPEND_CFLAGS("-I${PYTHON_INCLUDE_DIRS} " )
9996PKG_CONFIG_APPEND_CFLAGS("-I${NUMPY_INCLUDE_DIRS} " )
100- #PKG_CONFIG_APPEND_LIBS_RAW(${Boost_LIBRARIES})
10197PKG_CONFIG_APPEND_LIBS("boost_python" )
10298PKG_CONFIG_APPEND_LIBS_RAW(${PYTHON_LIBRARIES} )
10399PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME} )
104100
105101SETUP_PROJECT_FINALIZE()
106- SETUP_PROJECT_CPACK()
107-
0 commit comments