Skip to content

Commit a88c06b

Browse files
authored
Merge pull request #207 from jcarpent/devel
Improve packaging
2 parents 335e052 + 9a6a371 commit a88c06b

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.github/workflows/build.yml renamed to .github/workflows/windows-conda.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,16 @@ jobs:
3535
-G "NMake Makefiles" ^
3636
-DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
3737
-DCMAKE_BUILD_TYPE=Release ^
38-
-DEIGENPY_SITELIB_ROOT=%CONDA_PREFIX% ^
38+
-DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^
3939
-DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^
4040
..
41+
42+
:: Build and Install
4143
cmake --build . --config Release --target install
44+
45+
:: Testing
4246
ctest --output-on-failure -C Release -V
47+
48+
:: Test Python import
49+
cd ..
50+
python -c "import eigenpy"

python/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME})
1919
IF(NOT WIN32)
2020
TARGET_COMPILE_OPTIONS(${PYWRAP} PRIVATE "-Wno-conversion")
2121
ENDIF()
22-
IF(EIGENPY_SITELIB_ROOT)
23-
SET(${PYWRAP}_INSTALL_DIR ${EIGENPY_SITELIB_ROOT}/${PYTHON_SITELIB}/${PROJECT_NAME})
22+
IF(IS_ABSOLUTE ${PYTHON_SITELIB})
23+
SET(${PYWRAP}_INSTALL_DIR ${PYTHON_SITELIB}/${PROJECT_NAME})
2424
ELSE()
2525
SET(${PYWRAP}_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/${PROJECT_NAME})
2626
ENDIF()

0 commit comments

Comments
 (0)