Commit 18223733 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'devel' into 'main'

new tag

See merge request !34
parents 3037533c fbbdb2f1
......@@ -114,8 +114,6 @@ license_headers:
- key: wolf-focal
paths:
- ci_deps/wolf/
except:
- master
before_script:
- *preliminaries_definition
- *install_wolf_definition
......@@ -133,8 +131,6 @@ build_and_test:bionic:
- key: visionutils-bionic
paths:
- ci_deps/vision_utils/
except:
- master
before_script:
- *preliminaries_definition
- *install_wolf_definition
......@@ -154,8 +150,6 @@ build_and_test:focal:
- key: visionutils-focal
paths:
- ci_deps/vision_utils/
except:
- master
before_script:
- *preliminaries_definition
- *install_wolf_definition
......
......@@ -48,7 +48,7 @@ macro(wolf_report_not_found REASON_MSG)
# FindPackage() use the camelcase library name, not uppercase.
if (wolfvision_FIND_QUIETLY)
message(STATUS "Failed to find wolfvision- " ${REASON_MSG} ${ARGN})
else (wolfvision_FIND_REQUIRED)
elseif (wolfvision_FIND_REQUIRED)
message(FATAL_ERROR "Failed to find wolfvision - " ${REASON_MSG} ${ARGN})
else()
# Neither QUIETLY nor REQUIRED, use SEND_ERROR which emits an error
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment