Merge pull request #207 from jcarpent/devel

Improve packaging

.github/workflows/build.yml → .github/workflows/windows-conda.yml

@@ -35,8 +35,16 @@ jobs:
           -G "NMake Makefiles" ^
           -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
           -DCMAKE_BUILD_TYPE=Release ^
-          -DEIGENPY_SITELIB_ROOT=%CONDA_PREFIX% ^
+          -DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^
           -DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^
           ..
+
+        :: Build and Install
         cmake --build . --config Release --target install
+
+        :: Testing
         ctest --output-on-failure -C Release -V
+
+        :: Test Python import
+        cd ..
+        python -c "import eigenpy"

cmake @ b12791b8

-Subproject commit 69cc5ff7fff74a2594a633461885412ea98645ea
+Subproject commit b12791b89aa99c88bd24326daaa4b4add27d3a33

python/CMakeLists.txt

@@ -19,8 +19,8 @@ TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME})
 IF(NOT WIN32)
   TARGET_COMPILE_OPTIONS(${PYWRAP} PRIVATE "-Wno-conversion")
 ENDIF()
-IF(EIGENPY_SITELIB_ROOT)
-  SET(${PYWRAP}_INSTALL_DIR ${EIGENPY_SITELIB_ROOT}/${PYTHON_SITELIB}/${PROJECT_NAME})
+IF(IS_ABSOLUTE ${PYTHON_SITELIB})
+  SET(${PYWRAP}_INSTALL_DIR ${PYTHON_SITELIB}/${PROJECT_NAME})
 ELSE()
   SET(${PYWRAP}_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/${PROJECT_NAME})
 ENDIF()