diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index 52b9845e10e9694fdbc3c5ff0b18b446bffd125b..f651d902955381ebdc57efcadb72d210c363dfc5 100644 --- a/.github/workflows/windows-conda.yml +++ b/.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" diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 1b5f1cc5c06831e655ee929219fbd1731aaaa574..12430ef309300669aca08eb21f2c35143ebffe80 100644 --- a/python/CMakeLists.txt +++ b/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()