Skip to content

Commit

Permalink
Compiles in devcontainer
Browse files Browse the repository at this point in the history
  • Loading branch information
bernedom committed Apr 15, 2024
1 parent e070fd2 commit 9c373f5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions chapter05/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 9c373f5

Please sign in to comment.