[Windows] Accommodate different drives for --root (#1071)

* accommodate different drives. * revert extra changes.
ros · Mar 19, 2020 · 6a927bc · 6a927bc
1 parent 5723296
commit 6a927bc
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/cmake/templates/python_distutils_install.bat.in b/cmake/templates/python_distutils_install.bat.in
@@ -7,14 +7,19 @@ if DEFINED DESTDIR (
 
 cd "@INSTALL_CMD_WORKING_DIRECTORY@"
 
-mkdir "@CMAKE_INSTALL_PREFIX@\@PYTHON_INSTALL_DIR@"
+mkdir "@SETUPTOOLS_INSTALL_PREFIX@\@PYTHON_INSTALL_DIR@"
 
-set "PYTHONPATH=@CMAKE_INSTALL_PREFIX@\@PYTHON_INSTALL_DIR@;@CMAKE_BINARY_DIR@\@PYTHON_INSTALL_DIR@"
+set "PYTHONPATH=@SETUPTOOLS_INSTALL_PREFIX@\@PYTHON_INSTALL_DIR@;@CMAKE_BINARY_DIR@\@PYTHON_INSTALL_DIR@"
 set "CATKIN_BINARY_DIR=@CMAKE_BINARY_DIR@"
+for /f "usebackq tokens=*" %%a in ('@SETUPTOOLS_INSTALL_PREFIX@') do (
+  set _SETUPTOOLS_INSTALL_PATH=%%~pna
+  set _SETUPTOOLS_INSTALL_ROOT=%%~da
+)
+
 "@PYTHON_EXECUTABLE@" ^
     "@CMAKE_CURRENT_SOURCE_DIR@\setup.py" ^
     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" ^
     install %DESTDIR_ARG% @SETUPTOOLS_ARG_EXTRA@ ^
-    --prefix="@SETUPTOOLS_INSTALL_PREFIX@" ^
-    --install-scripts="@SETUPTOOLS_INSTALL_PREFIX@\@CATKIN_GLOBAL_BIN_DESTINATION@" ^
-    --root=\
+    --prefix="%_SETUPTOOLS_INSTALL_PATH%" ^
+    --install-scripts="%_SETUPTOOLS_INSTALL_PATH%\@CATKIN_GLOBAL_BIN_DESTINATION@" ^
+    --root=%_SETUPTOOLS_INSTALL_ROOT%\