Skip to content

Commit

Permalink
[Windows][kinetic] Fix python_distutils_install.bat.in (ros#992)
Browse files Browse the repository at this point in the history
* Fix python_distutils_install.bat.in

* add missing newline at the end of the file

* remove the extra "-p"
  • Loading branch information
seanyen authored and dirk-thomas committed Feb 21, 2019
1 parent 9db6116 commit 6157b75
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions cmake/templates/python_distutils_install.bat.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ if DEFINED DESTDIR (

cd "@INSTALL_CMD_WORKING_DIRECTORY@"

cmd /V:on /C set PYTHONPATH="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@;@CMAKE_BINARY_DIR@/@PYTHON_INSTALL_DIR@" ^
&& set CATKIN_BINARY_DIR="@CMAKE_BINARY_DIR@" ^
&& "@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@"
mkdir "@CMAKE_INSTALL_PREFIX@\@PYTHON_INSTALL_DIR@"

set "PYTHONPATH=@CMAKE_INSTALL_PREFIX@\@PYTHON_INSTALL_DIR@;@CMAKE_BINARY_DIR@\@PYTHON_INSTALL_DIR@"
set "CATKIN_BINARY_DIR=@CMAKE_BINARY_DIR@"
"@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@"

0 comments on commit 6157b75

Please sign in to comment.