From b7a3acafe30ca5daf9043d74b9632a234fb3971a Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Tue, 27 Dec 2022 15:53:51 +0700 Subject: [PATCH] new ci scripts and presets --- .ci/build_coverage.sh | 19 -- .ci/build_darwin.sh | 11 - .ci/build_linux.sh | 11 - .ci/build_windows_x64.bat | 19 -- .ci/build_windows_x86.bat | 19 -- .github/workflows/coverage.yml | 16 -- .github/workflows/darwin.yml | 21 +- .github/workflows/linux.yml | 24 +- .github/workflows/windows.yml | 28 ++- .vscode/settings.json | 6 + CMakeLists.txt | 3 +- CMakePresets.json | 261 +++++++++++++++++++++- README.md | 16 +- singles/CMakeLists.txt | 4 +- {.ci => singles/scripts}/build_singles.py | 0 untests/CMakeLists.txt | 13 ++ vendors/doctest | 2 +- 17 files changed, 325 insertions(+), 148 deletions(-) delete mode 100755 .ci/build_coverage.sh delete mode 100755 .ci/build_darwin.sh delete mode 100755 .ci/build_linux.sh delete mode 100644 .ci/build_windows_x64.bat delete mode 100644 .ci/build_windows_x86.bat delete mode 100644 .github/workflows/coverage.yml rename {.ci => singles/scripts}/build_singles.py (100%) diff --git a/.ci/build_coverage.sh b/.ci/build_coverage.sh deleted file mode 100755 index 7c8a1aa..0000000 --- a/.ci/build_coverage.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -e -DIR="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )" - -ROOT_DIR="${DIR}/.." -BUILD_DIR="${ROOT_DIR}/build/coverage" - -mkdir -p "${BUILD_DIR}" -(cd "${BUILD_DIR}" && cmake "${ROOT_DIR}" -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COVERAGE=ON) -(cd "${BUILD_DIR}" && cmake --build .) - -(cd "${BUILD_DIR}" && lcov -d . -z) -(cd "${BUILD_DIR}" && ctest --verbose) - -(cd "${BUILD_DIR}" && lcov -d . -c -o "coverage.info") -(cd "${BUILD_DIR}" && lcov -r "coverage.info" "*/usr/*" "*/untests/*" -o "coverage.info") -(cd "${BUILD_DIR}" && lcov -l "coverage.info") - -bash <(curl -s https://codecov.io/bash) -f "${BUILD_DIR}/coverage.info" || echo "Codecov did not collect coverage reports" diff --git a/.ci/build_darwin.sh b/.ci/build_darwin.sh deleted file mode 100755 index 658e0c1..0000000 --- a/.ci/build_darwin.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e -DIR="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )" - -ROOT_DIR="${DIR}/.." -BUILD_DIR="${ROOT_DIR}/build/darwin_release" - -mkdir -p "${BUILD_DIR}" -(cd "${BUILD_DIR}" && cmake "${ROOT_DIR}" -DCMAKE_BUILD_TYPE=Release) -(cd "${BUILD_DIR}" && cmake --build .) -(cd "${BUILD_DIR}" && ctest --verbose) diff --git a/.ci/build_linux.sh b/.ci/build_linux.sh deleted file mode 100755 index c622bc4..0000000 --- a/.ci/build_linux.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e -DIR="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )" - -ROOT_DIR="${DIR}/.." -BUILD_DIR="${ROOT_DIR}/build/linux_release" - -mkdir -p "${BUILD_DIR}" -(cd "${BUILD_DIR}" && cmake "${ROOT_DIR}" -DCMAKE_BUILD_TYPE=Release) -(cd "${BUILD_DIR}" && cmake --build .) -(cd "${BUILD_DIR}" && ctest --verbose) diff --git a/.ci/build_windows_x64.bat b/.ci/build_windows_x64.bat deleted file mode 100644 index 0fff1e8..0000000 --- a/.ci/build_windows_x64.bat +++ /dev/null @@ -1,19 +0,0 @@ -@echo off -set DIR=%~dp0 - -set ROOT_DIR=%DIR%..\ -set BUILD_DIR=%ROOT_DIR%build\windows_release_x64\ - -if not exist %BUILD_DIR% mkdir %BUILD_DIR% || goto :error - -pushd %BUILD_DIR% || goto :error -cmake %ROOT_DIR% -A x64 || goto :error -cmake --build . --config Release || goto :error -ctest --verbose || goto :error -popd || goto :error - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/.ci/build_windows_x86.bat b/.ci/build_windows_x86.bat deleted file mode 100644 index 58f0a9f..0000000 --- a/.ci/build_windows_x86.bat +++ /dev/null @@ -1,19 +0,0 @@ -@echo off -set DIR=%~dp0 - -set ROOT_DIR=%DIR%..\ -set BUILD_DIR=%ROOT_DIR%build\windows_release_x86\ - -if not exist %BUILD_DIR% mkdir %BUILD_DIR% || goto :error - -pushd %BUILD_DIR% || goto :error -cmake %ROOT_DIR% -A Win32 || goto :error -cmake --build . --config Release || goto :error -ctest --verbose || goto :error -popd || goto :error - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml deleted file mode 100644 index 09e95e1..0000000 --- a/.github/workflows/coverage.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: coverage - -on: [push, pull_request] - -jobs: - build: - runs-on: macos-10.15 - name: "coverage" - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: Install lcov by Homebrew - run: brew install lcov - - name: Build && Test && Upload - run: .ci/build_coverage.sh diff --git a/.github/workflows/darwin.yml b/.github/workflows/darwin.yml index 07e86ea..2ccdac0 100644 --- a/.github/workflows/darwin.yml +++ b/.github/workflows/darwin.yml @@ -10,15 +10,22 @@ jobs: matrix: config: # https://github.com/actions/virtual-environments/tree/main/images/macos - - { os: "macos-10.15", xcode: "10.3" } - - { os: "macos-10.15", xcode: "11.7" } - - { os: "macos-10.15", xcode: "12.4" } + - { os: "macos-10.15", xcode: "10.3", arch: "x64" } + - { os: "macos-12", xcode: "14.2", arch: "x64" } name: "xcode-${{matrix.config.xcode}}" steps: - - uses: actions/checkout@v2 + - name: Setup + run: brew install cmake ninja + - name: Checkout + uses: actions/checkout@v3 with: - submodules: recursive + submodules: true - name: Select Xcode run: sudo xcode-select --switch "/Applications/Xcode_${{matrix.config.xcode}}.app" - - name: Build && Test - run: .ci/build_darwin.sh + - name: Build + run: | + cmake --preset macos-${{matrix.config.arch}} + cmake --build --preset macos-${{matrix.config.arch}}-release + - name: Test + run: | + ctest --preset macos-${{matrix.config.arch}}-release \ No newline at end of file diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c785bc7..0908f50 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -11,21 +11,21 @@ jobs: config: # https://github.com/actions/virtual-environments/tree/main/images/linux - { os: "ubuntu-20.04", cc: "gcc-7", cxx: "g++-7" } - - { os: "ubuntu-20.04", cc: "gcc-8", cxx: "g++-8" } - - { os: "ubuntu-20.04", cc: "gcc-9", cxx: "g++-9" } - - { os: "ubuntu-20.04", cc: "gcc-10", cxx: "g++-10" } - { os: "ubuntu-20.04", cc: "clang-7", cxx: "clang++-7" } - - { os: "ubuntu-20.04", cc: "clang-8", cxx: "clang++-8" } - - { os: "ubuntu-20.04", cc: "clang-9", cxx: "clang++-9" } - - { os: "ubuntu-20.04", cc: "clang-10", cxx: "clang++-10" } + - { os: "ubuntu-22.04", cc: "gcc-12", cxx: "g++-12" } + - { os: "ubuntu-22.04", cc: "clang-14", cxx: "clang++-14" } name: "${{matrix.config.cxx}}" steps: - name: Setup - run: sudo apt-get -y install "${{matrix.config.cc}}" "${{matrix.config.cxx}}" + run: sudo apt-get -y install cmake ninja-build ${{matrix.config.cc}} ${{matrix.config.cxx}} - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - submodules: recursive - - name: Build && Test - run: .ci/build_linux.sh - env: { CC: "${{matrix.config.cc}}", CXX: "${{matrix.config.cxx}}" } + submodules: true + - name: Build + run: | + cmake --preset linux-${{matrix.config.cc}} + cmake --build --preset linux-${{matrix.config.cc}}-release + - name: Test + run: | + ctest --preset linux-${{matrix.config.cc}}-release diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5d154bd..47bafa9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,14 +10,24 @@ jobs: matrix: config: # https://github.com/actions/virtual-environments/tree/main/images/win - - { os: "windows-2019", vs: "Visual Studio 2019", arch: "x86" } - - { os: "windows-2019", vs: "Visual Studio 2019", arch: "x64" } - - { os: "windows-2022", vs: "Visual Studio 2022", arch: "x86" } - - { os: "windows-2022", vs: "Visual Studio 2022", arch: "x64" } - name: "${{matrix.config.vs}} ${{matrix.config.arch}}" + - { os: "windows-2019", vc: "msvc2019", arch: "x86" } + - { os: "windows-2019", vc: "msvc2019", arch: "x64" } + - { os: "windows-2022", vc: "msvc2022", arch: "x86" } + - { os: "windows-2022", vc: "msvc2022", arch: "x64" } + name: "${{matrix.config.vc}} ${{matrix.config.arch}}" steps: - - uses: actions/checkout@v2 + - name: Setup + run: choco install cmake ninja + - name: Checkout + uses: actions/checkout@v3 with: - submodules: recursive - - name: Build && Test - run: .ci\build_windows_${{matrix.config.arch}}.bat + submodules: true + - name: Select MSVC + uses: ilammy/msvc-dev-cmd@v1 + - name: Build + run: | + cmake --preset windows-${{matrix.config.arch}}-${{matrix.config.vc}} + cmake --build --preset windows-${{matrix.config.arch}}-${{matrix.config.vc}}-release + - name: Test + run: | + ctest --preset windows-${{matrix.config.arch}}-${{matrix.config.vc}}-release diff --git a/.vscode/settings.json b/.vscode/settings.json index 53d3e94..dbf82d7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,10 @@ { + "[cpp]": { + "files.encoding": "utf8", + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true + }, "clangd.arguments": [ "--all-scopes-completion", "--background-index", diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e3827e..43f6d97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ -# 3.8 version is required for `cxx_std_17` -cmake_minimum_required(VERSION 3.8 FATAL_ERROR) +cmake_minimum_required(VERSION 3.15 FATAL_ERROR) if(NOT DEFINED PROJECT_NAME) set(BUILD_AS_STANDALONE ON) diff --git a/CMakePresets.json b/CMakePresets.json index c2723d1..8f0ec5d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -18,10 +18,57 @@ "CMAKE_EXPORT_COMPILE_COMMANDS": true } }, + { + "name": "linux-base", + "hidden": true, + "inherits": "ninja-base", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + } + }, + { + "name": "linux-clang-7", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_C_COMPILER": "clang-7", + "CMAKE_CXX_COMPILER": "clang++-7" + } + }, + { + "name": "linux-clang-14", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_C_COMPILER": "clang-14", + "CMAKE_CXX_COMPILER": "clang++-14" + } + }, + { + "name": "linux-gcc-7", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_C_COMPILER": "gcc-7", + "CMAKE_CXX_COMPILER": "g++-7" + } + }, + { + "name": "linux-gcc-12", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_C_COMPILER": "gcc-12", + "CMAKE_CXX_COMPILER": "g++-12" + } + }, { "name": "macos-base", "hidden": true, - "inherits": "ninja-base" + "inherits": "ninja-base", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + } }, { "name": "macos-arm64", @@ -52,10 +99,124 @@ "cacheVariables": { "BUILD_WITH_SANITIZERS": true } + }, + { + "name": "windows-base", + "hidden": true, + "inherits": "ninja-base", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "windows-x86-msvc2019", + "inherits": "windows-base", + "architecture": { + "value": "x86", + "strategy": "external" + }, + "toolset": { + "value": "v142,host=x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl" + } + }, + { + "name": "windows-x64-msvc2019", + "inherits": "windows-base", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "toolset": { + "value": "v142,host=x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl" + } + }, + { + "name": "windows-x86-msvc2022", + "inherits": "windows-base", + "architecture": { + "value": "x86", + "strategy": "external" + }, + "toolset": { + "value": "v143,host=x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl" + } + }, + { + "name": "windows-x64-msvc2022", + "inherits": "windows-base", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "toolset": { + "value": "v143,host=x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl" + } } ], "buildPresets": [ + { + "name": "linux-clang-7-debug", + "configuration": "Debug", + "configurePreset": "linux-clang-7" + }, + { + "name": "linux-clang-7-release", + "configuration": "Release", + "configurePreset": "linux-clang-7" + }, + { + "name": "linux-clang-14-debug", + "configuration": "Debug", + "configurePreset": "linux-clang-14" + }, + { + "name": "linux-clang-14-release", + "configuration": "Release", + "configurePreset": "linux-clang-14" + }, + { + "name": "linux-gcc-7-debug", + "configuration": "Debug", + "configurePreset": "linux-gcc-7" + }, + { + "name": "linux-gcc-7-release", + "configuration": "Release", + "configurePreset": "linux-gcc-7" + }, + { + "name": "linux-gcc-12-debug", + "configuration": "Debug", + "configurePreset": "linux-gcc-12" + }, + { + "name": "linux-gcc-12-release", + "configuration": "Release", + "configurePreset": "linux-gcc-12" + }, { "name": "macos-arm64-debug", "configuration": "Debug", @@ -75,29 +236,107 @@ "name": "macos-x64-release", "configuration": "Release", "configurePreset": "macos-x64" + }, + { + "name": "windows-x86-msvc2019-debug", + "configuration": "Debug", + "configurePreset": "windows-x86-msvc2019" + }, + { + "name": "windows-x86-msvc2019-release", + "configuration": "Release", + "configurePreset": "windows-x86-msvc2019" + }, + { + "name": "windows-x64-msvc2019-debug", + "configuration": "Debug", + "configurePreset": "windows-x64-msvc2019" + }, + { + "name": "windows-x64-msvc2019-release", + "configuration": "Release", + "configurePreset": "windows-x64-msvc2019" + }, + { + "name": "windows-x86-msvc2022-debug", + "configuration": "Debug", + "configurePreset": "windows-x86-msvc2022" + }, + { + "name": "windows-x86-msvc2022-release", + "configuration": "Release", + "configurePreset": "windows-x86-msvc2022" + }, + { + "name": "windows-x64-msvc2022-debug", + "configuration": "Debug", + "configurePreset": "windows-x64-msvc2022" + }, + { + "name": "windows-x64-msvc2022-release", + "configuration": "Release", + "configurePreset": "windows-x64-msvc2022" } ], "testPresets": [ { - "name": "macos-arm64-debug", - "configuration": "Debug", - "configurePreset": "macos-arm64-san" + "name": "test-base", + "hidden": true, + "output": { + "verbosity": "verbose" + }, + "configuration": "Release" + }, + { + "name": "linux-clang-7-release", + "inherits": "test-base", + "configurePreset": "linux-clang-7" + }, + { + "name": "linux-clang-14-release", + "inherits": "test-base", + "configurePreset": "linux-clang-14" + }, + { + "name": "linux-gcc-7-release", + "inherits": "test-base", + "configurePreset": "linux-gcc-7" + }, + { + "name": "linux-gcc-12-release", + "inherits": "test-base", + "configurePreset": "linux-gcc-12" }, { "name": "macos-arm64-release", - "configuration": "Release", + "inherits": "test-base", "configurePreset": "macos-arm64" }, { - "name": "macos-x64-debug", - "configuration": "Debug", - "configurePreset": "macos-x64-san" + "name": "macos-x64-release", + "inherits": "test-base", + "configurePreset": "macos-x64" }, { - "name": "macos-x64-release", - "configuration": "Release", - "configurePreset": "macos-x64" + "name": "windows-x86-msvc2019-release", + "inherits": "test-base", + "configurePreset": "windows-x86-msvc2019" + }, + { + "name": "windows-x64-msvc2019-release", + "inherits": "test-base", + "configurePreset": "windows-x64-msvc2019" + }, + { + "name": "windows-x86-msvc2022-release", + "inherits": "test-base", + "configurePreset": "windows-x86-msvc2022" + }, + { + "name": "windows-x64-msvc2022-release", + "inherits": "test-base", + "configurePreset": "windows-x64-msvc2022" } ] } diff --git a/README.md b/README.md index 9e68999..59ddb2d 100644 --- a/README.md +++ b/README.md @@ -5,21 +5,18 @@ [![linux][badge.linux]][linux] [![darwin][badge.darwin]][darwin] [![windows][badge.windows]][windows] -[![codecov][badge.codecov]][codecov] [![language][badge.language]][language] [![license][badge.license]][license] -[badge.darwin]: https://img.shields.io/github/workflow/status/BlackMATov/vmath.hpp/darwin/main?label=Xcode&logo=xcode -[badge.linux]: https://img.shields.io/github/workflow/status/BlackMATov/vmath.hpp/linux/main?label=GCC%2FClang&logo=linux -[badge.windows]: https://img.shields.io/github/workflow/status/BlackMATov/vmath.hpp/windows/main?label=Visual%20Studio&logo=visual-studio -[badge.codecov]: https://img.shields.io/codecov/c/github/BlackMATov/vmath.hpp/main?logo=codecov +[badge.darwin]: https://img.shields.io/github/actions/workflow/status/BlackMATov/vmath.hpp/.github/workflows/darwin.yml?label=Xcode&logo=xcode +[badge.linux]: https://img.shields.io/github/actions/workflow/status/BlackMATov/vmath.hpp/.github/workflows/linux.yml?label=GCC%2FClang&logo=linux +[badge.windows]: https://img.shields.io/github/actions/workflow/status/BlackMATov/vmath.hpp/.github/workflows/windows.yml?label=Visual%20Studio&logo=visual-studio [badge.language]: https://img.shields.io/badge/language-C%2B%2B17-yellow [badge.license]: https://img.shields.io/badge/license-MIT-blue [darwin]: https://github.com/BlackMATov/vmath.hpp/actions?query=workflow%3Adarwin [linux]: https://github.com/BlackMATov/vmath.hpp/actions?query=workflow%3Alinux [windows]: https://github.com/BlackMATov/vmath.hpp/actions?query=workflow%3Awindows -[codecov]: https://codecov.io/gh/BlackMATov/vmath.hpp [language]: https://en.wikipedia.org/wiki/C%2B%2B17 [license]: https://en.wikipedia.org/wiki/MIT_License @@ -27,9 +24,10 @@ ## Requirements -- [gcc](https://www.gnu.org/software/gcc/) **>= 7** - [clang](https://clang.llvm.org/) **>= 7** -- [msvc](https://visualstudio.microsoft.com/) **>= 2017** +- [gcc](https://www.gnu.org/software/gcc/) **>= 7** +- [msvc](https://visualstudio.microsoft.com/) **>= 2019** +- [xcode](https://developer.apple.com/xcode/) **>= 10.3** ## Installation @@ -43,7 +41,7 @@ Also, you can add the root repository directory to your [cmake](https://cmake.or ```cmake add_subdirectory(external/vmath.hpp) -target_link_libraries(your_project_target vmath.hpp) +target_link_libraries(your_project_target PUBLIC vmath.hpp) ``` ## Disclaimer diff --git a/singles/CMakeLists.txt b/singles/CMakeLists.txt index 5268cce..b3e401a 100644 --- a/singles/CMakeLists.txt +++ b/singles/CMakeLists.txt @@ -4,7 +4,7 @@ project(vmath.hpp.singles) # generate # -find_package(PythonInterp REQUIRED) +find_package(Python3 REQUIRED COMPONENTS Interpreter) set(VMATH_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..") set(VMATH_SINGLES_INPUT "${VMATH_ROOT_DIR}/headers/vmath.hpp/vmath_all.hpp") @@ -12,7 +12,7 @@ set(VMATH_SINGLES_OUTPUT "${VMATH_ROOT_DIR}/singles/headers/vmath.hpp/vmath_all. file(GLOB_RECURSE VMATH_SINGLES_DEPENDS "${VMATH_ROOT_DIR}/headers/*.hpp") add_custom_command(OUTPUT "${VMATH_SINGLES_OUTPUT}" - COMMAND "${PYTHON_EXECUTABLE}" ".ci/build_singles.py" "${VMATH_SINGLES_INPUT}" "${VMATH_SINGLES_OUTPUT}" + COMMAND "${Python3_EXECUTABLE}" "singles/scripts/build_singles.py" "${VMATH_SINGLES_INPUT}" "${VMATH_SINGLES_OUTPUT}" DEPENDS ${VMATH_SINGLES_DEPENDS} WORKING_DIRECTORY "${VMATH_ROOT_DIR}") diff --git a/.ci/build_singles.py b/singles/scripts/build_singles.py similarity index 100% rename from .ci/build_singles.py rename to singles/scripts/build_singles.py diff --git a/untests/CMakeLists.txt b/untests/CMakeLists.txt index 343a66a..b54bb5f 100644 --- a/untests/CMakeLists.txt +++ b/untests/CMakeLists.txt @@ -9,6 +9,19 @@ target_link_libraries(${PROJECT_NAME} PRIVATE vmath.hpp) add_executable(${PROJECT_NAME}.singles ${UNTESTS_SOURCES}) target_link_libraries(${PROJECT_NAME}.singles PRIVATE vmath.hpp.singles) +# +# setup defines +# + +function(setup_defines_for_target TARGET) + target_compile_definitions(${TARGET} PRIVATE + DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + DOCTEST_CONFIG_USE_STD_HEADERS) +endfunction() + +setup_defines_for_target(${PROJECT_NAME}) +setup_defines_for_target(${PROJECT_NAME}.singles) + # # setup libraries # diff --git a/vendors/doctest b/vendors/doctest index 7b98851..b7c21ec 160000 --- a/vendors/doctest +++ b/vendors/doctest @@ -1 +1 @@ -Subproject commit 7b9885133108ae301ddd16e2651320f54cafeba7 +Subproject commit b7c21ec5ceeadb4951b00396fc1e4642dd347e5f