Merge branch 'devel' into 'main'

new tag

See merge request !35

.gitlab-ci.yml

@@ -152,8 +152,6 @@ license_headers:
     - key: wolf-focal
       paths:
       - ci_deps/wolf/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -171,8 +169,6 @@ build_and_test_none:bionic:
     - key: laserscanutils-bionic
       paths:
       - ci_deps/laser_scan_utils/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -193,8 +189,6 @@ build_and_test_csm:bionic:
     - key: csm-bionic
       paths:
       - ci_deps/csm/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -216,8 +210,6 @@ build_and_test_falko:bionic:
     - key: falko-bionic
       paths:
       - ci_deps/falkolib/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -242,8 +234,6 @@ build_and_test_csm_falko:bionic:
     - key: falko-bionic
       paths:
       - ci_deps/falkolib/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -264,8 +254,6 @@ build_and_test_none:focal:
     - key: laserscanutils-focal
       paths:
       - ci_deps/laser_scan_utils/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -286,8 +274,6 @@ build_and_test_csm:focal:
     - key: csm-focal
       paths:
       - ci_deps/csm/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -309,8 +295,6 @@ build_and_test_falko:focal:
     - key: falko-focal
       paths:
       - ci_deps/falkolib/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -335,8 +319,6 @@ build_and_test_csm_falko:focal:
     - key: falko-focal
       paths:
       - ci_deps/falkolib/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition

cmake_modules/wolflaserConfig.cmake

@@ -48,7 +48,7 @@ macro(wolf_report_not_found REASON_MSG)
   # FindPackage() use the camelcase library name, not uppercase.
   if (wolflaser_FIND_QUIETLY)
     message(STATUS "Failed to find wolf laser- " ${REASON_MSG} ${ARGN})
-  else (wolflaser_FIND_REQUIRED)
+  elseif(wolflaser_FIND_REQUIRED)
     message(FATAL_ERROR "Failed to find wolf laser - " ${REASON_MSG} ${ARGN})
   else()
     # Neither QUIETLY nor REQUIRED, use SEND_ERROR which emits an error