Merge pull request #1 from PacktPublishing/second_revision

Second revision
PacktPublishing · Apr 5, 2024 · e070fd2 · e070fd2
2 parents a34c64a + 6ac639d
commit e070fd2
Show file tree

Hide file tree

Showing 76 changed files with 93 additions and 91 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,33 +1,35 @@
-FROM conanio/gcc11:1.44.1
+FROM ubuntu:22.04
 
-RUN pip3 install cmake-format pytest pytest-depends cpplint 
-
-# switch to root
-USER root
+ARG TZ=Europe/Zurich
 
 # install a few tools for more convenient developing
 RUN  apt-get update; \
-    apt-get -y install --fix-missing \
+    LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8" DEBIAN_FRONTEND=noninteractive apt-get -y install --fix-missing \
     gdb curl bash-completion vim rpm \
-    graphviz python3-pytest doxygen plantuml gcovr \
+    graphviz python3-pip python-is-python3 doxygen plantuml gcovr \
     clang-tidy cppcheck iwyu zip afl++ clang-format ccache \
     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
+    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 
 
+RUN pip install cmake-format pytest pytest-depends cpplint conan
 
-# Download version 3.21 from CMake
-RUN curl -OL https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-linux-x86_64.sh
+RUN groupadd -r builder 
+RUN useradd --create-home --gid builder --groups dialout,plugdev,audio,tty --shell /usr/bin/bash builder
 
-RUN chmod +x ./cmake-3.21.2-linux-x86_64.sh && ./cmake-3.21.2-linux-x86_64.sh --skip-license --prefix=/opt/pyenv/versions/3.7.5/ && rm ./cmake-3.21.2-linux-x86_64.sh
+# 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
+RUN head cmake-3.23.2-linux-x86_64.sh 
+RUN chmod +x ./cmake-3.23.2-linux-x86_64.sh && ./cmake-3.23.2-linux-x86_64.sh --skip-license --prefix=/usr/local 
 
-USER conan
+USER builder
 
 # Download and install vcpkg
-RUN curl -OL https://github.com/microsoft/vcpkg/archive/refs/tags/2021.05.12.tar.gz 
-RUN mkdir -p ~/.local/opt/vcpkg && mkdir -p ~/.local/bin/ && tar -xvf 2021.05.12.tar.gz --strip-components=1 -C ~/.local/opt/vcpkg && rm 2021.05.12.tar.gz
+RUN cd ~ && curl -OL https://github.com/microsoft/vcpkg/archive/refs/tags/2021.05.12.tar.gz 
+RUN mkdir -p ~/.local/opt/vcpkg && mkdir -p ~/.local/bin/ && tar -xvf ~/2021.05.12.tar.gz --strip-components=1 -C ~/.local/opt/vcpkg && rm ~/2021.05.12.tar.gz
 RUN ~/.local/opt/vcpkg/bootstrap-vcpkg.sh && ln -s ~/.local/opt/vcpkg/vcpkg ~/.local/bin/vcpkg
 
-#install git shell extension
+# install git shell extension
 RUN curl -L https://raw.github.com/git/git/master/contrib/completion/git-prompt.sh > ~/.bash_git && echo "source ~/.bash_git" >> ~/.bashrc
 RUN sed -Ei 's/(PS1=.*)(\\\[\\033\[00m\\\]\\\$.*)/\1\\[\\033[01;33m\\]$(__git_ps1)\2/p' ~/.bashrc
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -14,5 +14,5 @@
     "remoteEnv": {
         "DISPLAY": ":0"
     },
-    "containerUser": "conan"
+    "containerUser": "builder"
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@
 # Specifies the minimum required CMake version to build this project (and
 # subprojects) Subprojects may override this value by specifying another version
 # requirement in their CMakeLists file (e.g. require a later version of CMake)
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 # The main project
 project(

diff --git a/chapter01/CMakeLists.txt b/chapter01/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     chapter_1

diff --git a/chapter01/policy_example/CMakeLists.txt b/chapter01/policy_example/CMakeLists.txt
@@ -3,7 +3,7 @@
 # 
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     ch1_policy_example

diff --git a/chapter01/simple_executable/CMakeLists.txt b/chapter01/simple_executable/CMakeLists.txt
@@ -3,7 +3,7 @@
 # 
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 # Define a CMake project
 project(

diff --git a/chapter02/CMakeLists.txt b/chapter02/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     "CMake Best Practices Chapter 2"

diff --git a/chapter03/CMakeLists.txt b/chapter03/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     chapter_3

diff --git a/chapter03/hello_header_only/CMakeLists.txt b/chapter03/hello_header_only/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     ch3_hello_header_only

diff --git a/chapter03/hello_world_standalone/CMakeLists.txt b/chapter03/hello_world_standalone/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     ch3_hello_world_standalone

diff --git a/chapter04/CMakeLists.txt b/chapter04/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   "CMake Best Practices Chapter 4"

diff --git a/chapter04/ex01_executable/CMakeLists.txt b/chapter04/ex01_executable/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex01_executable

diff --git a/chapter04/ex02_static/CMakeLists.txt b/chapter04/ex02_static/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex02_static

diff --git a/chapter04/ex03_file/CMakeLists.txt b/chapter04/ex03_file/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex03_file

diff --git a/chapter04/ex04_directory/CMakeLists.txt b/chapter04/ex04_directory/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex04_directory

diff --git a/chapter04/ex05_config_file_package/CMakeLists.txt b/chapter04/ex05_config_file_package/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex05_lib

diff --git a/chapter04/ex05_consumer/CMakeLists.txt b/chapter04/ex05_consumer/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex05_consumer

diff --git a/chapter04/ex06_pack/CMakeLists.txt b/chapter04/ex06_pack/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex06_pack
@@ -22,7 +22,7 @@ add_subdirectory(library)
 # let CPack to get project name and version from the project()
 set(CPACK_PACKAGE_VENDOR "CBP Authors")
 # Enable DEB, RPM and TBZ2 generators by default
-set(CPACK_GENERATOR "DEB;RPM;TBZ2")
+set(CPACK_GENERATOR "DEB;TBZ2;TGZ;STGZ")
 # Use all available cores when parallelism is supported
 set(CPACK_THREADS 0) 
 # The DEB generator requires CPACK_DEBIAN_PACKAGE_MAINTAINER

diff --git a/chapter04/ex06_pack/executable/CMakeLists.txt b/chapter04/ex06_pack/executable/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex06_executable

diff --git a/chapter04/ex06_pack/library/CMakeLists.txt b/chapter04/ex06_pack/library/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   ch4_ex06_library

diff --git a/chapter05/CMakeLists.txt b/chapter05/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     "Chapter_5"

diff --git a/chapter05/conan_conanfile_example/CMakeLists.txt b/chapter05/conan_conanfile_example/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     conan_conanfile_example

diff --git a/chapter05/conan_example/CMakeLists.txt b/chapter05/conan_example/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 # using language CXX and C is necessary so conan recognizes the compiler correctly when compiling with clang under windows
 project(

diff --git a/chapter05/external_project_example/CMakeLists.txt b/chapter05/external_project_example/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     ch5_external_project_example

diff --git a/chapter05/fetch_content_example/CMakeLists.txt b/chapter05/fetch_content_example/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     ch5_fetch_content_example

diff --git a/chapter05/find_module/CMakeLists.txt b/chapter05/find_module/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     ch5_find_module_example

diff --git a/chapter05/find_module/cmake/FindObscure.cmake b/chapter05/find_module/cmake/FindObscure.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 # find the libary file libobscure.so obscure.dll or libobscure.1.0.0.so or similar
 # Additionally to the default paths look in ${PROJECT_SOURCE_DIR}/dep/

diff --git a/chapter05/find_module/dep_source/CMakeLists.txt b/chapter05/find_module/dep_source/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     an_obscure_lib

diff --git a/chapter05/find_package_example/CMakeLists.txt b/chapter05/find_package_example/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     ch5_find_package_example

diff --git a/chapter05/vcpkg_example/CMakeLists.txt b/chapter05/vcpkg_example/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     ch5_vcpkg_example

diff --git a/chapter06/CMakeLists.txt b/chapter06/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 option(ENABLE_DOCUMENTATION "Enable documentation" OFF)
 

diff --git a/chapter07/CMakeLists.txt b/chapter07/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     "Chapter_7"

diff --git a/chapter07/clang_tidy_example/CMakeLists.txt b/chapter07/clang_tidy_example/CMakeLists.txt
@@ -3,7 +3,7 @@
 # 
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   "ch7_clang_tidy_example"

diff --git a/chapter07/cppcheck_example/CMakeLists.txt b/chapter07/cppcheck_example/CMakeLists.txt
@@ -3,7 +3,7 @@
 # 
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   "ch7_cppcheck_example"

diff --git a/chapter07/cpplint_example/CMakeLists.txt b/chapter07/cpplint_example/CMakeLists.txt
@@ -3,7 +3,7 @@
 # 
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   "ch7_cpplint_example"

diff --git a/chapter07/custom_build_type/CMakeLists.txt b/chapter07/custom_build_type/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
     "ch7_custom_build_type"

diff --git a/chapter07/fixture_example/CMakeLists.txt b/chapter07/fixture_example/CMakeLists.txt
@@ -3,7 +3,7 @@
 # 
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   "ch7_fixture_sample"

diff --git a/chapter07/iwyu_example/CMakeLists.txt b/chapter07/iwyu_example/CMakeLists.txt
@@ -3,7 +3,7 @@
 # 
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   "ch7_iwyu_example"

diff --git a/chapter07/lwyu_example/CMakeLists.txt b/chapter07/lwyu_example/CMakeLists.txt
@@ -3,7 +3,7 @@
 # 
 # SPDX-License-Identifier: MIT
 
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.23)
 
 project(
   "ch7_lwyu_example"