Skip to content

Commit 68bf0fd

Browse files
nmansardnmansard
authored andcommitted
Integrated Justin's modif in CMake.
1 parent 4056bbc commit 68bf0fd

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ SET(BOOST_COMPONENTS python)
3030
SEARCH_FOR_BOOST()
3131
set(Python_ADDITIONAL_VERSIONS 2.7)
3232
FINDPYTHON()
33-
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
3433

3534
# ----------------------------------------------------
3635
# --- INCLUDE ----------------------------------------
@@ -67,17 +66,20 @@ ENDFOREACH(header)
6766
# ----------------------------------------------------
6867
# --- TARGETS ----------------------------------------
6968
# ----------------------------------------------------
69+
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
70+
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
7071

71-
ADD_LIBRARY(eigenpy SHARED
72+
SET(eigenpy_SOURCES
7273
src/exception.cpp
7374
src/eigenpy.cpp
7475
src/details.cpp
7576
src/angle-axis.cpp
7677
src/quaternion.cpp
7778
)
78-
TARGET_LINK_LIBRARIES(eigenpy ${Boost_LIBRARIES})
79-
INSTALL(TARGETS eigenpy DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
8079

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)
8183

8284
# ----------------------------------------------------
8385
# --- UNIT TEST --------------------------------------
@@ -92,7 +94,10 @@ SET_TARGET_PROPERTIES(geometry PROPERTIES PREFIX "")
9294

9395
PKG_CONFIG_APPEND_CFLAGS(${_Eigen_CFLAGS})
9496
PKG_CONFIG_APPEND_CFLAGS("-I${PYTHON_INCLUDE_DIRS}")
95-
PKG_CONFIG_APPEND_LIBS_RAW(${Boost_LIBRARIES})
97+
#PKG_CONFIG_APPEND_LIBS_RAW(${Boost_LIBRARIES})
98+
PKG_CONFIG_APPEND_LIBS("boost_python")
99+
PKG_CONFIG_APPEND_LIBS_RAW(${PYTHON_LIBRARIES})
100+
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
96101

97102
SETUP_PROJECT_FINALIZE()
98103
SETUP_PROJECT_CPACK()

0 commit comments

Comments
 (0)