diff --git a/.gitignore b/.gitignore index e1376c64b..5dd06103e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,8 @@ src/interfaces/python/ *.qrc.depends .dpkg_pkgs/ - +build/ +build_clean/ # Python __pycache__/ diff --git a/Deps/opencv/CMakeLists.txt b/Deps/opencv/CMakeLists.txt index 72293093e..85f5f1bd8 100644 --- a/Deps/opencv/CMakeLists.txt +++ b/Deps/opencv/CMakeLists.txt @@ -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=") ENDIF() diff --git a/README.md b/README.md index 42cf09d4e..b8f5c5ec9 100644 --- a/README.md +++ b/README.md @@ -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