Skip to content

Commit 7bf615f

Browse files
committed
Update dependencies and windows build
1 parent 34110fd commit 7bf615f

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.github/workflows/windows_noetic_build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ jobs:
3939
rosdep install -q --from-paths . --ignore-src -y
4040
4141
catkin_make_isolated --install --use-nmake --force-cmake --only-pkg-with-deps tesseract_python --cmake-args -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=C:/opt/ros/noetic/x64/python.exe -DPYTHON_LIBRARY=C:/opt/ros/noetic/x64/Lib/python38.lib -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master -DBUILD_IPOPT=OFF -DBUILD_SNOPT=OFF -DINSTALL_FCL=ON -DINSTALL_BULLET=ON -DNO_OPENCL=ON
42-
call "D:\a\tesseract_python\tesseract_python\install_isolated\setup.bat"
43-
catkin_make_isolated --install --use-nmake --force-cmake --pkg tesseract_python --cmake-args -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=C:/opt/ros/noetic/x64/python.exe -DPYTHON_LIBRARY=C:/opt/ros/noetic/x64/Lib/python38.lib -DTESSERACT_ENABLE_TESTING=ON -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master -DBUILD_IPOPT=OFF -DBUILD_SNOPT=OFF -DINSTALL_FCL=ON -DINSTALL_BULLET=ON -DNO_OPENCL=ON
42+
call "%CD%\install_isolated\setup.bat"
43+
set TESSERACT_SUPPORT_DIR=%CD%\src\tesseract\tesseract_support
44+
C:/opt/ros/noetic/x64/python.exe -m pytest src\tesseract_python\tesseract_python

dependencies.rosinstall

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
- git:
77
local-name: tesseract
8-
uri: https://github.com/tesseract-robotics/tesseract.git
9-
version: 0.13.0
8+
uri: https://github.com/johnwason/tesseract.git
9+
version: pr/BulletLibsAbsPath
1010
- git:
1111
local-name: tesseract_planning
12-
uri: https://github.com/johnwason/tesseract_planning.git
13-
version: pr/TrajoptIfoptOptional
12+
uri: https://github.com/tesseract-robotics/tesseract_planning.git
13+
version: 0c0983699f4afab3251daae6665bc0c9336f97f0
1414
- git:
1515
local-name: trajopt
1616
uri: https://github.com/tesseract-robotics/trajopt.git

dependencies_with_ext.rosinstall

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
- git:
77
local-name: tesseract
8-
uri: https://github.com/tesseract-robotics/tesseract.git
9-
version: 0.13.0
8+
uri: https://github.com/johnwason/tesseract.git
9+
version: pr/BulletLibsAbsPath
1010
- git:
1111
local-name: tesseract_planning
12-
uri: https://github.com/johnwason/tesseract_planning.git
13-
version: pr/TrajoptIfoptOptional
12+
uri: https://github.com/tesseract-robotics/tesseract_planning.git
13+
version: 0c0983699f4afab3251daae6665bc0c9336f97f0
1414
- git:
1515
local-name: trajopt
1616
uri: https://github.com/tesseract-robotics/trajopt.git

0 commit comments

Comments
 (0)