@@ -30,6 +30,7 @@ SET(BOOST_COMPONENTS python)
3030SEARCH_FOR_BOOST()
3131set (Python_ADDITIONAL_VERSIONS 2.7)
3232FINDPYTHON()
33+ FIND_NUMPY()
3334
3435# ----------------------------------------------------
3536# --- INCLUDE ----------------------------------------
@@ -66,34 +67,36 @@ ENDFOREACH(header)
6667# ----------------------------------------------------
6768# --- TARGETS ----------------------------------------
6869# ----------------------------------------------------
69- INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_DIRS} )
70+ INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} )
71+ # Add Boost path to include directories.
7072INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS} )
7173
72- SET (eigenpy_SOURCES
74+ SET (${PROJECT_NAME} _SOURCES
7375 src/exception.cpp
7476 src/eigenpy.cpp
7577 src/details.cpp
7678 src/angle-axis.cpp
7779 src/quaternion.cpp
78- )
80+ )
7981
80- ADD_LIBRARY (eigenpy SHARED ${eigenpy_SOURCES } )
81- TARGET_LINK_LIBRARIES (eigenpy ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
82- INSTALL (TARGETS eigenpy DESTINATION ${CMAKE_INSTALL_PREFIX} /lib)
82+ ADD_LIBRARY (${PROJECT_NAME} SHARED ${${PROJECT_NAME} _SOURCES })
83+ TARGET_LINK_LIBRARIES (${PROJECT_NAME} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
84+ INSTALL (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX} /lib)
8385
8486# ----------------------------------------------------
8587# --- UNIT TEST --------------------------------------
8688# ----------------------------------------------------
8789ADD_LIBRARY (matrix SHARED unittest/matrix.cpp)
88- TARGET_LINK_LIBRARIES (matrix ${Boost_LIBRARIES} eigenpy )
90+ TARGET_LINK_LIBRARIES (matrix ${Boost_LIBRARIES} ${PROJECT_NAME} )
8991SET_TARGET_PROPERTIES (matrix PROPERTIES PREFIX "" )
9092
9193ADD_LIBRARY (geometry SHARED unittest/geometry.cpp)
92- TARGET_LINK_LIBRARIES (geometry ${Boost_LIBRARIES} eigenpy )
94+ TARGET_LINK_LIBRARIES (geometry ${Boost_LIBRARIES} ${PROJECT_NAME} )
9395SET_TARGET_PROPERTIES (geometry PROPERTIES PREFIX "" )
9496
9597PKG_CONFIG_APPEND_CFLAGS(${_Eigen_CFLAGS} )
9698PKG_CONFIG_APPEND_CFLAGS("-I${PYTHON_INCLUDE_DIRS} " )
99+ PKG_CONFIG_APPEND_CFLAGS("-I${NUMPY_INCLUDE_DIRS} " )
97100#PKG_CONFIG_APPEND_LIBS_RAW(${Boost_LIBRARIES})
98101PKG_CONFIG_APPEND_LIBS("boost_python" )
99102PKG_CONFIG_APPEND_LIBS_RAW(${PYTHON_LIBRARIES} )
0 commit comments