Fix

Author: anlowee

CMakeLists.txt

@@ -56,8 +56,6 @@ endif()
 find_package(Boost REQUIRED)
 if(Boost_FOUND)
     message(STATUS "Found Boost ${Boost_VERSION}.")
-else()
-    message(STATUS "Could not find libraries for Boost.")
 endif()
 
 if(YSTDLIB_CPP_ENABLE_TESTS)

src/.clang-format

@@ -6,7 +6,7 @@ IncludeCategories:
   # NOTE: clang-format retains leading white-space on a line in violation of the YAML spec.
   - Regex: "<(ystdlib)"
     Priority: 3
-  - Regex: "<(catch2|outcome)"
+  - Regex: "<(catch2|boost)"
     Priority: 4
   # C system headers
   - Regex: "^<.+\\.h>"

src/ystdlib/error_handling/Result.hpp

@@ -1,11 +1,12 @@
 #ifndef YSTDLIB_ERROR_HANDLING_RESULT_HPP
 #define YSTDLIB_ERROR_HANDLING_RESULT_HPP
 
+#include <system_error>
+
 #include <boost/outcome/config.hpp>
 #include <boost/outcome/std_result.hpp>
 #include <boost/outcome/success_failure.hpp>
 #include <boost/outcome/try.hpp>
-#include <system_error>
 
 namespace ystdlib::error_handling {
 /**

src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp

@@ -2,7 +2,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-namespace ystdlib::wrapped_facade_headers::test { namespace {
+namespace ystdlib::wrapped_facade_headers::test {
 TEST_CASE("test_sys_types_u_char", "[wrapped_facade_headers][sys_types][u_char]") {
     u_char const i{0};
     REQUIRE(0 == i);
@@ -163,4 +163,4 @@ TEST_CASE("test_sys_types_fsfilcnt_t", "[wrapped_facade_headers][sys_types][fsfi
     fsfilcnt_t const i{0};
     REQUIRE(0 == i);
 }
-}}  // namespace ystdlib::wrapped_facade_headers::test
+}  // namespace ystdlib::wrapped_facade_headers::test

taskfiles/deps.yaml

@@ -39,175 +39,10 @@ tasks:
     internal: true
     run: "once"
     cmds:
-      - task: "boost-download-and-install"
+      - task: ":utils:boost:download-and-install"
         vars:
-          WORK_DIR: "{{.G_DEPS_DIR}}/boost"
-          FILE_SHA256: "2128a4c96862b5c0970c1e34d76b1d57e4a1016b80df85ad39667f30b1deba26"
+          CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
+          FILE_SHA256: "d6c69e4459eb5d6ec208250291221e7ff4a2affde9af6e49c9303b89c687461f"
           URL: "https://github.com/boostorg/boost/releases/download/boost-1.87.0/\
             boost-1.87.0-b2-nodocs.tar.gz"
-          CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
-          TARGETS:
-            - "filesystem"
-            - "iostreams"
-            - "process"
-            - "program_options"
-            - "regex"
-            - "system"
-
-  # Runs the bootstrap.sh generate step in the given source directory. Boost only supports
-  # in-source generation and building.
-  #
-  # @param {string} SOURCE_DIR Project source directory.
-  # @param {string} INSTALL_PREFIX Path prefix of where the project should be installed.
-  # @param {string[]} TARGETS Target libraries to build.
-  # @param {string[]} [EXTRA_ARGS] Any additional arguments to pass to the generate command.
-  boost-generate:
-    internal: true
-    dir: "{{.SOURCE_DIR}}"
-    cmds:
-      - >-
-        ./bootstrap.sh
-        --prefix="{{.INSTALL_PREFIX}}"
-        --exec-prefix="{{.INSTALL_PREFIX}}"
-        --with-libraries={{(join "," .TARGETS)}}
-        {{- range .EXTRA_ARGS}}
-        "{{.}}"
-        {{- end}}
-
-  # Runs the b2 build step for boost. The caller must have previously called `generate` on
-  # `SOURCE_DIR` for this task to succeed.
-  #
-  # @param {string} SOURCE_DIR Directory containing the boost source.
-  # @param {string[]} [EXTRA_ARGS] Any additional arguments to pass to the build command.
-  # @param {int} [JOBS] The maximum number of concurrent processes to use when building. If
-  # omitted, the b2 default number is used. Before 1.76.0, the number was 1. Since 1.76.0, the
-  # default is the number of cores.
-  boost-build:
-    internal: true
-    dir: "{{.SOURCE_DIR}}"
-    cmds:
-      - >-
-        ./b2
-        {{- range .EXTRA_ARGS}}
-        "{{.}}"
-        {{- end}}
-        {{- if .JOBS}}
-        "-j{{.JOBS}}"
-        {{- end}}
-
-  # Runs the b2 install step for boost. The caller must have previously called `build` on
-  # `SOURCE_DIR` for this task to succeed. If `CMAKE_SETTINGS_DIR` is set, a settings file will be
-  # created in that directory, containing a `boost_ROOT` CMake variable that points to
-  # `INSTALL_PREFIX`.
-  #
-  # @param {string} SOURCE_DIR Directory containing the boost source.
-  # @param {string} INSTALL_PREFIX Path prefix of where the project should be installed.
-  # @param {string} [CMAKE_SETTINGS_DIR] If set, the directory where the project's CMake settings
-  # file should be stored.
-  # @param {string[]} [EXTRA_ARGS] Any additional arguments to pass to the install command.
-  boost-install:
-    internal: true
-    dir: "{{.SOURCE_DIR}}"
-    cmds:
-      - >-
-        ./b2
-        install
-        {{- range .EXTRA_ARGS}}
-        "{{.}}"
-        {{- end}}
-      - >-
-        {{- if .CMAKE_SETTINGS_DIR}}
-          echo "set(BOOST_ROOT
-            \"{{.INSTALL_PREFIX}}\"
-            CACHE PATH
-            \"Package root for boost.\"
-          )" >> "{{.CMAKE_SETTINGS_DIR}}/boost.cmake"
-        {{- end}}
-
-  # Downloads boost from `URL` and installs boost.
-  #
-  # General parameters
-  # @param {string} [WORK_DIR={{.TASK_DIR}}] Base directory to store the install and src
-  # directories inside.
-  # @param {string} [SOURCE_DIR={{.WORK_DIR}}/boost-src] Directory in which to extract the tar
-  # file.
-  #
-  # Download parameters
-  # @param {string} FILE_SHA256 Content hash to verify the downloaded tar file against.
-  # @param {string} URL
-  #
-  # Boost generate parameters
-  # @param {string} [INSTALL_PREFIX={{.WORK_DIR}}/boost-install] Path prefix of where the project
-  # should be installed.
-  # @param {string[]} TARGETS Target libraries to build.
-  # @param {string[]} [GEN_ARGS] Any additional arguments to pass to the generate command.
-  #
-  # Boost build parameters
-  # @param {int} [JOBS] The maximum number of concurrent processes to use when building. If
-  # omitted, the b2 default number is used. Before 1.76.0, the number was 1. Since 1.76.0, the
-  # default is the number of cores.
-  # @param {string[]} [BUILD_ARGS] Any additional arguments to pass to the build command.
-  #
-  # Boost install parameters
-  # @param {string[]} [INSTALL_ARGS] Any additional arguments to pass to the install command.
-  # @param {string} [CMAKE_SETTINGS_DIR] If set, the directory where the project's CMake settings
-  # file should be stored.
-  boost-download-and-install:
-    internal: true
-    label: "{{.TASK}}:{{.URL}}-{{.INSTALL_PREFIX}}"
-    vars:
-      # General parameters
-      WORK_DIR: >-
-        {{default .ROOT_DIR .WORK_DIR}}
-      SOURCE_DIR: >-
-        {{default (printf "%s/boost-src" .WORK_DIR) .SOURCE_DIR}}
-
-      # Boost generate parameters
-      INSTALL_PREFIX: >-
-        {{default (printf "%s/boost-install" .WORK_DIR) .INSTALL_PREFIX}}
-      TARGETS:
-        ref: "default (list) .TARGETS"
-      GEN_ARGS:
-        ref: "default (list) .GEN_ARGS"
-
-      # Boost build parameters
-      BUILD_ARGS:
-        ref: "default (list) .BUILD_ARGS"
-      JOBS: >-
-        {{default "" .JOBS}}
-
-      # Boost install parameters
-      INSTALL_ARGS:
-        ref: "default (list) .INSTALL_ARGS"
-      CMAKE_SETTINGS_DIR: >-
-          {{default "" .CMAKE_SETTINGS_DIR}}
-    requires:
-      vars: ["FILE_SHA256", "URL"]
-    deps:
-      - task: ":utils:remote:download-and-extract-tar"
-        vars:
-          FILE_SHA256: "{{.FILE_SHA256}}"
-          OUTPUT_DIR: "{{.SOURCE_DIR}}"
-          URL: "{{.URL}}"
-    cmds:
-      - task: "boost-generate"
-        vars:
-          SOURCE_DIR: "{{.SOURCE_DIR}}"
-          INSTALL_PREFIX: "{{.INSTALL_PREFIX}}"
-          TARGETS:
-            ref: ".TARGETS"
-          EXTRA_ARGS:
-            ref: ".GEN_ARGS"
-      - task: "boost-build"
-        vars:
-          SOURCE_DIR: "{{.SOURCE_DIR}}"
-          JOBS: "{{.JOBS}}"
-          EXTRA_ARGS:
-            ref: ".BUILD_ARGS"
-      - task: "boost-install"
-        vars:
-          SOURCE_DIR: "{{.SOURCE_DIR}}"
-          INSTALL_PREFIX: "{{.INSTALL_PREFIX}}"
-          CMAKE_SETTINGS_DIR: "{{.CMAKE_SETTINGS_DIR}}"
-          EXTRA_ARGS:
-            ref: ".INSTALL_ARGS"
+          WORK_DIR: "{{.G_DEPS_DIR}}/boost"

taskfiles/lint-cmake.yaml

@@ -15,9 +15,6 @@ tasks:
       - exclude: "{{.ROOT_DIR}}/**/CMakeFiles/*"
       - exclude: "{{.ROOT_DIR}}/**/submodules/*"
       - exclude: "{{.ROOT_DIR}}/**/tools/*"
-
-      # Exclude CMake build directories generated by CLion
-      - exclude: "{{.ROOT_DIR}}/**/cmake-build-*"
     deps:
       - "venv"
     cmds:
@@ -51,14 +48,8 @@ tasks:
       - |-
         . "{{.G_LINT_VENV_DIR}}/bin/activate"
         find . \
-          \( \
-            -path '**/build' \
-            -o -path '**/cmake-build-*' \
-            -o -path '**/cmake_install.cmake' \
-            -o -path '**/CMakeFiles' \
-            -o -path '**/submodules' \
-            -o -path '**/tools' \
-          \) -prune -o \
+          \( -path '**/build' -o -path '**/cmake_install.cmake' -o -path '**/CMakeFiles' \
+          -o -path '**/submodules' -o -path '**/tools' \) -prune -o \
           \( -iname "CMakeLists.txt" -o -iname "*.cmake" -o -iname "*.cmake.in" \) \
           -print0 | \
             xargs -0 gersemi {{.FLAGS}}