Skip to content
This repository has been archived by the owner on Feb 21, 2021. It is now read-only.

Commit

Permalink
update files
Browse files Browse the repository at this point in the history
  • Loading branch information
@fqez
fqez committed Mar 21, 2020
1 parent 19d3522 commit e163be8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ src/interfaces/python/
*.qrc.depends

.dpkg_pkgs/

build/
build_clean/

# Python
__pycache__/
Expand Down
4 changes: 2 additions & 2 deletions Deps/opencv/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ SET(OpenCVGUI_LIBRARIES ${OpenCV_GUI_LIBS})
#TRY MANUAL IF AUTO FAILS
IF (NOT DEFINED OpenCV_VERSION)
IF (NOT OpenCV_DIR)
IF (EXISTS /opt/ros/kinetic/)
SET(OpenCV_DIR /opt/ros/kinetic/)
IF (EXISTS /opt/ros/melodic/)
SET(OpenCV_DIR /opt/ros/melodic/)
ELSE()
MESSAGE(FATAL_ERROR "OpenCV not found, if you are using a custom opencv installation set if by -DOpenCV_DIR=<your_install_path>")
ENDIF()
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ source ~/.bashrc
compile ice:

```
git clone -b 3.7.2 https://github.com/zeroc-ice/ice.git
git clone -b 3.7 https://github.com/zeroc-ice/ice.git
cd ice/cpp
make CPP11=yes OPTIMIZE=yes
make install
Expand Down

0 comments on commit e163be8

Please sign in to comment.