Merge branch 'devel' into 'main'

Devel

See merge request !6

.gitlab-ci.yml

+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+      when: never
+    - if: '$CI_COMMIT_BRANCH'
+
 stages:
   - license
   - build_and_test
@@ -10,7 +20,6 @@ stages:
   - echo $WOLF_IMU_BRANCH
   - echo $WOLF_ROS_NODE_BRANCH
   - echo $CI_COMMIT_BRANCH
-  - echo $WOLF_ROS_IMU_BRANCH
 
 .preliminaries_template: &preliminaries_definition
   ## Install ssh-agent if not already installed, it is required by Docker.
@@ -79,8 +88,7 @@ stages:
   - if [ -d wolf ]; then
   -   echo "directory wolf exists"
   -   cd wolf
-  -   git checkout devel
-  -   git pull
+  -   git fetch --all
   -   git checkout $WOLF_CORE_BRANCH
   -   git pull
   - else
@@ -98,8 +106,7 @@ stages:
   - if [ -d imu ]; then
   -   echo "directory imu exists"
   -   cd imu
-  -   git checkout devel
-  -   git pull
+  -   git fetch --all
   -   git checkout $WOLF_IMU_BRANCH
   -   git pull
   - else

CMakeLists.txt

@@ -4,7 +4,7 @@ project(wolf_ros_imu)
 ## Compile as C++14
 add_compile_options(-std=c++14) 
 # -fPIC and -rdynamic ensure unique singleton instance across shared libraries (for factories) see: https://stackoverflow.com/a/8626922
-SET(CMAKE_CXX_FLAGS "-fPIC -rdynamic")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -rdynamic")
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
@@ -52,11 +52,13 @@ add_library(publisher_${PROJECT_NAME}
 target_link_libraries(subscriber_${PROJECT_NAME}
             wolfcore
             wolfimu
+            ${catkin_LIBRARIES}
             ${sensor_msgs_LIBRARIES}
             )
 
 target_link_libraries(publisher_${PROJECT_NAME}
             wolfcore
             wolfimu
+            ${catkin_LIBRARIES}
             ${sensor_msgs_LIBRARIES}
             )
\ No newline at end of file

package.xml

@@ -2,7 +2,7 @@
 <package format="2">
   <name>wolf_ros_imu</name>
   <version>0.0.0</version>
-  <description>The wolf_ros package of GAUSS project</description>
+  <description>The wolf_ros package of WOLF project</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->