Skip to content

Commit 6eb5c84

Browse files
authored
Merge pull request #197 from jcarpent/devel
Clean CMake
2 parents 8833b01 + bef3122 commit 6eb5c84

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

cmake

python/CMakeLists.txt

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
#
2-
# Copyright (c) 2014-2019 CNRS
3-
# Copyright (c) 2018-2019 INRIA
2+
# Copyright (c) 2014-2020 CNRS INRIA
43
#
54

6-
MACRO(SYMLINK_AND_INSTALL_HEADERS HEADERS SUBPATH)
7-
FOREACH(header ${HEADERS})
8-
GET_FILENAME_COMPONENT(headerName ${header} NAME)
9-
GET_FILENAME_COMPONENT(headerPath ${header} PATH)
10-
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E ${LINK}
11-
${CMAKE_CURRENT_SOURCE_DIR}/${header}
12-
${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${SUBPATH}/${header})
13-
14-
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${header}
15-
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}/${SUBPATH}/${headerPath}
16-
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
17-
ENDFOREACH(header)
18-
ENDMACRO(SYMLINK_AND_INSTALL_HEADERS HEADERS SUBPATH)
19-
205
# --- LIBRARY --- #
216
SET(PYWRAP ${PROJECT_NAME}_pywrap)
227
SET(PYWRAP ${PYWRAP} PARENT_SCOPE)
@@ -34,10 +19,7 @@ TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME})
3419
IF(NOT WIN32)
3520
TARGET_COMPILE_OPTIONS(${PYWRAP} PRIVATE "-Wno-conversion")
3621
ENDIF()
37-
#IF(BUILD_WITH_COMMIT_VERSION)
38-
# TAG_LIBRARY_VERSION(${PYWRAP})
39-
#ENDIF(BUILD_WITH_COMMIT_VERSION)
40-
IF(DEFINED EIGENPY_SITELIB_ROOT AND EIGENPY_SITELIB_ROOT)
22+
IF(EIGENPY_SITELIB_ROOT)
4123
SET(${PYWRAP}_INSTALL_DIR ${EIGENPY_SITELIB_ROOT}/${PYTHON_SITELIB}/${PROJECT_NAME})
4224
ELSE()
4325
SET(${PYWRAP}_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/${PROJECT_NAME})
@@ -59,9 +41,6 @@ SET(PYTHON_FILES
5941
)
6042

6143
FOREACH(python ${PYTHON_FILES})
62-
IF(NOT WIN32)
63-
PYTHON_BUILD(${PROJECT_NAME} ${python})
64-
ENDIF()
6544
INSTALL(FILES
6645
"${CMAKE_CURRENT_SOURCE_DIR}/eigenpy/${python}"
6746
DESTINATION ${${PYWRAP}_INSTALL_DIR})

0 commit comments

Comments
 (0)