Merge pull request #129 from jcarpent/devel

python: install lib inside site-packages/eigenpy

python/CMakeLists.txt

@@ -34,9 +34,9 @@ ENDIF()
 #  TAG_LIBRARY_VERSION(${PYWRAP})
 #ENDIF(BUILD_WITH_COMMIT_VERSION)
 IF(DEFINED EIGENPY_SITELIB_ROOT AND EIGENPY_SITELIB_ROOT)
-  SET(${PYWRAP}_INSTALL_DIR ${EIGENPY_SITELIB_ROOT}/${PYTHON_SITELIB})
+  SET(${PYWRAP}_INSTALL_DIR ${EIGENPY_SITELIB_ROOT}/${PYTHON_SITELIB}/${PROJECT_NAME})
 ELSE()
-  SET(${PYWRAP}_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB})
+  SET(${PYWRAP}_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/${PROJECT_NAME})
 ENDIF()
 
 SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES SUFFIX ${PYTHON_EXT_SUFFIX})
@@ -49,35 +49,15 @@ SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
 
 INSTALL(TARGETS ${PYWRAP} DESTINATION ${${PYWRAP}_INSTALL_DIR})
 
-## --- INSTALL SCRIPTS 
-#SET(PYTHON_FILES
-#  __init__.py
-#  )
-#
-#FOREACH(python ${PYTHON_FILES})
-#  GET_FILENAME_COMPONENT(pythonFile ${python} NAME)
-#  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E ${LINK}
-#    ${${PROJECT_NAME}_SOURCE_DIR}/python/scripts/${python}
-#    ${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}/${pythonFile})
-#    
-#  # Generate pyc file
-#  EXECUTE_PROCESS(COMMAND
-#    ${PYTHON_EXECUTABLE} -m py_compile
-#    ${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}/${pythonFile})
-#  # Tag pyc file as generated.
-#  SET_SOURCE_FILES_PROPERTIES(
-#    "${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}/${pythonFile}c"
-#    PROPERTIES GENERATED TRUE)
-#    
-#  # Clean generated files.
-#  SET_PROPERTY(
-#    DIRECTORY APPEND PROPERTY
-#    ADDITIONAL_MAKE_CLEAN_FILES
-#    "${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}/${pythonFile}c")
-#    
-#  INSTALL(FILES
-#    "${${PROJECT_NAME}_SOURCE_DIR}/python/scripts/${python}"
-#    "${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}/${pythonFile}c"
-#    DESTINATION ${${PYWRAP}_INSTALL_DIR})
-#ENDFOREACH(python)
+# --- INSTALL SCRIPTS 
+SET(PYTHON_FILES
+  __init__.py
+  )
+
+FOREACH(python ${PYTHON_FILES})
+  PYTHON_BUILD(${PROJECT_NAME} ${python})
+  INSTALL(FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/eigenpy/${python}"
+    DESTINATION ${${PYWRAP}_INSTALL_DIR})
+ENDFOREACH(python)
 

python/scripts/__init__.py → python/eigenpy/__init__.py

 #
-# Copyright (c) 2017 CNRS
+# Copyright (c) 2017-2019 CNRS INRIA
 #
 # This file is part of eigenpy
 # eigenpy is free software: you can redistribute it
@@ -14,5 +14,4 @@
 # eigenpy If not, see
 # <http://www.gnu.org/licenses/>.
 
-import numpy as np
 from eigenpy import *