diff --git a/.github/workflows/docker-build-test.yaml b/.github/workflows/docker-build-test.yaml index bdd5393..03c770e 100644 --- a/.github/workflows/docker-build-test.yaml +++ b/.github/workflows/docker-build-test.yaml @@ -41,7 +41,8 @@ jobs: shell: bash options: -v ${{ github.workspace }}:/home/user/flexxlam_sdk run: | - mkdir ~/flexxlam_sdk/build && \ + rm -rf ~/flexxlam_sdk/build && \ + mkdir -p ~/flexxlam_sdk/build && \ cd ~/flexxlam_sdk/build && \ cmake .. && \ make -j @@ -57,7 +58,8 @@ jobs: shell: bash options: -v ${{ github.workspace }}:/home/user/flexxlam_sdk run: | - mkdir ~/flexxlam_sdk/build && \ + rm -rf ~/flexxlam_sdk/build && \ + mkdir -p ~/flexxlam_sdk/build && \ cd ~/flexxlam_sdk/build && \ cmake -Dtest=true .. && \ make -j && \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c3672a..6317bc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,7 @@ option(test "Build unit tests." OFF) set(INSTALL_STATIC "Install static library" ON) set(INSTALL_SHARED "Install shared library" ON) +set(BUILD_EXAMPLES "Build examples" ON) set (CPACK_PACKAGE_NAME ${PROJECT_NAME}) set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "FlexXlam SDK") @@ -107,7 +108,9 @@ if (INSTALL_SHARED) endif() # Examples -add_subdirectory(examples/client) +if (BUILD_EXAMPLES) + add_subdirectory(examples/client) +endif() # Unit test if (test) diff --git a/docker/Dockerfile b/docker/Dockerfile index 13eab42..c74bd41 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -44,7 +44,7 @@ RUN git clone https://github.com/google/glog.git -b v0.6.0 && \ sudo cmake --build build --target install # Install formatter, linter -RUN sudo apt-get install -y python3-pip cppcheck flex bison libserial-dev graphviz +RUN sudo apt-get install -y python3-pip cppcheck flex bison libserial-dev graphviz libgtest-dev RUN python3 -m pip install cpplint clang-format RUN git clone https://github.com/doxygen/doxygen.git -b Release_1_9_8 \ && mkdir -p doxygen/build \ diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index bd4069c..846f7a7 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -44,7 +44,7 @@ RUN git clone https://github.com/google/glog.git -b v0.6.0 && \ sudo cmake --build build --target install # Install formatter, linter -RUN sudo apt-get install -y python3-pip cppcheck flex bison libserial-dev +RUN sudo apt-get install -y python3-pip cppcheck flex bison libserial-dev libgtest-dev RUN python3 -m pip install cpplint clang-format RUN sudo usermod -aG dialout user diff --git a/examples/client/flexxlam_client_example.cpp b/examples/client/flexxlam_client_example.cpp index 763b444..d49bf0c 100644 --- a/examples/client/flexxlam_client_example.cpp +++ b/examples/client/flexxlam_client_example.cpp @@ -14,7 +14,6 @@ #include #include #include -#include namespace flexxlam { diff --git a/include/protocol/command/command_save_pcd_protocol.hpp b/include/protocol/command/command_save_pcd_protocol.hpp index e482a67..c14a26e 100644 --- a/include/protocol/command/command_save_pcd_protocol.hpp +++ b/include/protocol/command/command_save_pcd_protocol.hpp @@ -11,7 +11,6 @@ #include #include "protocol/base_protocol.hpp" -#include "utils/string_utils.hpp" #include "utils/to_bytes.hpp" namespace flexxlam {