From 06c0e7b15ec6e65040676a5f2d31982805761ef0 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Sat, 16 Nov 2024 00:57:41 +0100 Subject: [PATCH] Fixes to Python build/install process. Related to #159. --- CMakeFiles/CwipcPythonSupport.cmake | 2 ++ cwipc_codec | 2 +- cwipc_kinect | 2 +- cwipc_realsense2 | 2 +- cwipc_util | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeFiles/CwipcPythonSupport.cmake b/CMakeFiles/CwipcPythonSupport.cmake index c9dc9a8..5252a4a 100644 --- a/CMakeFiles/CwipcPythonSupport.cmake +++ b/CMakeFiles/CwipcPythonSupport.cmake @@ -77,8 +77,10 @@ macro(cwipc_build_wheel) # We need a trick to pass CWIPC_VERSION in the environment at build time: use cmake -E env. add_custom_target("${MYARGS_NAME}_wheel" ALL + COMMAND ${CMAKE_COMMAND} -E rm -rf ${MYARGS_SOURCEDIR}/build ${MYARGS_SOURCEDIR}/{${MYARGS_NAME}.egg_info COMMAND ${CMAKE_COMMAND} -E env "CWIPC_VERSION=${CWIPC_VERSION}" ${Python3_EXECUTABLE} -m build --wheel --no-isolation --outdir ${MYARGS_WHEELDIR} ${MYARGS_SOURCEDIR} COMMAND ${Python3_EXECUTABLE} -m pip uninstall -qq -y "${MYARGS_NAME}" + COMMAND ${Python3_EXECUTABLE} -m pip install -e ${MYARGS_SOURCEDIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) endmacro() diff --git a/cwipc_codec b/cwipc_codec index c23fb7f..2aacbb8 160000 --- a/cwipc_codec +++ b/cwipc_codec @@ -1 +1 @@ -Subproject commit c23fb7fe0cbcdbb6c648d68478f51c948b26ad5d +Subproject commit 2aacbb8ae59ce6bdc8534da33d4c121d8e7b3f7b diff --git a/cwipc_kinect b/cwipc_kinect index 14ae16e..c482fbe 160000 --- a/cwipc_kinect +++ b/cwipc_kinect @@ -1 +1 @@ -Subproject commit 14ae16e28ce3b946be88856c2ef7a02db619b69b +Subproject commit c482fbe92ff6f48533c405c7c48bdf46f9723ebf diff --git a/cwipc_realsense2 b/cwipc_realsense2 index a0c63ab..b773e23 160000 --- a/cwipc_realsense2 +++ b/cwipc_realsense2 @@ -1 +1 @@ -Subproject commit a0c63ab5ed990be503c1f0f3901d5d21a8fb0d18 +Subproject commit b773e2352e4519b2663a8f44319beea4ccccd2f0 diff --git a/cwipc_util b/cwipc_util index f792e1e..ed6d8d5 160000 --- a/cwipc_util +++ b/cwipc_util @@ -1 +1 @@ -Subproject commit f792e1ef46ca9d15b533ac1bf5973978dca18cae +Subproject commit ed6d8d5e9c95ae8ff049a5a425550a6bb3bc9510