Skip to content

Commit

Permalink
add patch for python_qt_binding
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfv committed Sep 27, 2020
1 parent decae2a commit e6945e4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions patch/ros-noetic-catkin.win.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ index ca8d77cd..88ad363e 100644

# do not define STRICT macros (minwindef.h or boost\winapi\basic_types.hpp)
- add_definitions(-DNO_STRICT)
+ add_definitions(-DSTRICT)
+ #add_definitions(-DSTRICT)

# do not define min/max macros
add_definitions(-DNOMINMAX)

# do not define STRICT macros (qtgui\qwindowdefs_win.h)
- add_definitions(-DQ_NOWINSTRICT)
+ add_definitions(-DQ_WINSTRICT)
+ #add_definitions(-DQ_WINSTRICT)

# keep minimum windows headers inclusion
add_definitions(-DWIN32_LEAN_AND_MEAN)
2 changes: 1 addition & 1 deletion vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ packages_remove_from_deps:
skip_existing:
- https://conda.anaconda.org/robostack/

packages_select_by_deps:
packages_select_by_deps:
##
# TODO Linux + OSX
##
Expand Down
3 changes: 2 additions & 1 deletion win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ packages_remove_from_deps:
skip_existing:
# - https://conda.anaconda.org/robostack/

packages_select_by_deps:
packages_select_by_deps:
##
# TODO Win
##
- python_qt_binding
- qt_gui_cpp
- python_qt_binding
# - catkin
Expand Down

0 comments on commit e6945e4

Please sign in to comment.