diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 58d182e..20f2fd8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -11,12 +11,11 @@ RUN apt-get update; \ qemu qemu-system-arm gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user \ # QT runtime prerequisites libgl1-mesa-dev libglu1-mesa-dev '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev \ - libxkbcommon-dev libxkbcommon-x11-dev bash build-essential git wget ninja-build gcovr lcov + libxkbcommon-dev libxkbcommon-x11-dev bash build-essential git wget ninja-build gcovr lcov sudo libssl-dev RUN pip install cmake-format pytest pytest-depends cpplint conan -RUN groupadd -r builder -RUN useradd --create-home --gid builder --groups dialout,plugdev,audio,tty --shell /usr/bin/bash builder +RUN groupadd -r builder && useradd --create-home --gid builder --groups dialout,plugdev,audio,tty --shell /usr/bin/bash builder && mkdir -p /etc/sudoers.d && echo 'builder ALL=NOPASSWD: ALL' > /etc/sudoers.d/builder # Download version 3.23 of CMake RUN wget https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2-linux-x86_64.sh diff --git a/chapter05/CMakeLists.txt b/chapter05/CMakeLists.txt index 5a1746c..bbbc48a 100644 --- a/chapter05/CMakeLists.txt +++ b/chapter05/CMakeLists.txt @@ -22,8 +22,8 @@ add_subdirectory(external_project_example) find_program(CONAN_EXECUTABLE conan) if(CONAN_EXECUTABLE) - add_subdirectory(conan_example) - add_subdirectory(conan_conanfile_example) + # add_subdirectory(conan_example) + # add_subdirectory(conan_conanfile_example) else() message(STATUS "Conan not found. Will not build conan examples") endif()