Infrastructure overhaul

.github/workflows/ci.yml

@@ -0,0 +1,124 @@
+
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  workflow_dispatch:
+
+jobs:
+  GCC:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Install build infrastructure
+        run: sudo apt-get install -y build-essential cmake ninja-build gcc-13 g++-13 libstdc++-13-dev
+
+      - name: Build test
+        run: |
+          mkdir -p build/test 
+          cd build/test
+          cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQRCODE_TESTS_ENABLED:BOOL=True ../../
+          ninja
+
+      - name: Run test
+        run: build/test/test/libqrcode_test
+
+      - name: Build demo
+        run: | 
+          mkdir -p build/demo
+          cd build/demo 
+          cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DLIBQRCODE_INCLUDE_DIR=$GITHUB_WORKSPACE/include/ ../../demo 
+          ninja
+
+      - name: Run demo
+        run: |
+          build/demo/demo "Hello World!" >> result.svg
+          diff -u --ignore-space-change --strip-trailing-cr --ignore-blank-lines demo/qrcode.svg result.svg
+
+  Clang:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Install build infrastructure
+        run: sudo apt-get install -y build-essential cmake ninja-build clang-15 libstdc++-13-dev
+
+      - name: Build test
+        run: |
+          mkdir -p build/test 
+          cd build/test
+          cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQRCODE_TESTS_ENABLED:BOOL=True ../../
+          ninja
+
+      - name: Run test
+        run: build/test/test/libqrcode_test
+
+      - name: Build demo
+        run: | 
+          mkdir -p build/demo
+          cd build/demo 
+          cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DLIBQRCODE_INCLUDE_DIR=$GITHUB_WORKSPACE/include/ ../../demo 
+          ninja
+
+      - name: Run demo
+        run: |
+          build/demo/demo "Hello World!" >> result.svg
+          diff -u --ignore-space-change --strip-trailing-cr --ignore-blank-lines demo/qrcode.svg result.svg
+
+  AppleClang:
+    runs-on: macos-15
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Build test
+        run: |
+          mkdir -p build/test 
+          cd build/test
+          cmake -GXcode -DQRCODE_TESTS_ENABLED:BOOL=True ../../
+          xcodebuild -scheme ALL_BUILD -configuration Release build
+
+      - name: Run test
+        run: build/test/test/Release/libqrcode_test
+
+      - name: Build demo
+        run: | 
+          mkdir -p build/demo
+          cd build/demo 
+          cmake -GXcode -DLIBQRCODE_INCLUDE_DIR=$GITHUB_WORKSPACE/include/ ../../demo 
+          xcodebuild -scheme ALL_BUILD -configuration Release build
+
+      - name: Run demo
+        run: |
+          build/demo/Release/demo "Hello World!" >> result.svg
+          diff -u --ignore-space-change --strip-trailing-cr --ignore-blank-lines demo/qrcode.svg result.svg
+
+  MSVC:
+    runs-on: windows-2022
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Build test
+        shell: cmd 
+        run: ${{ '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" && mkdir build\test && cd build\test && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQRCODE_TESTS_ENABLED:BOOL=True ../../ && ninja' }}
+
+      - name: Run test
+        run: build/test/test/libqrcode_test
+
+      - name: Build demo
+        shell: cmd 
+        run: ${{ '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" && mkdir build\demo && cd build\demo && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DLIBQRCODE_INCLUDE_DIR="%cd%/include" ../../demo && ninja' }}
+
+      - name: Run demo
+        run: |
+          . build/demo/demo "Hello World!" >> result.svg
+          Compare-Object (Get-Content demo/qrcode.svg) (Get-Content result.svg)
+

.gitignore

@@ -1,3 +1,6 @@
 .vscode/
-build.log
-qrcode.svg
+build/
+out/
+.vs/
+.DS_Store
+CMakeSettings.json

CMakeLists.txt

@@ -1,7 +1,7 @@
 # 
 # The MIT License
 # 
-# Copyright (c) 2021 Sebastian Bauer
+# Copyright (c) 2025 Melissa Bauer
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@ endfunction()
 project(libqrcode)
 
 enable_testing()
-enable_cxx(20)
+enable_cxx(23)
 
 add_library(qrcode INTERFACE)
 
@@ -166,9 +166,8 @@ target_sources(qrcode INTERFACE
 )
 
 target_include_directories(qrcode INTERFACE "include")
-target_link_libraries(qrcode INTERFACE $<$<PLATFORM_ID:Linux>:stdc++ m>)
-target_link_libraries(qrcode INTERFACE $<$<PLATFORM_ID:Darwin>:stdc++ m>)
-target_compile_options(qrcode INTERFACE $<$<PLATFORM_ID:Windows>:/std:c++latest>)
+target_link_libraries(qrcode INTERFACE $<$<CXX_COMPILER_ID:Clang>:stdc++ m>)
+target_link_libraries(qrcode INTERFACE $<$<CXX_COMPILER_ID:AppleClang>:m>)
 
 if (QRCODE_TESTS_ENABLED)
     add_subdirectory(test)

CMakePresets.json

@@ -0,0 +1,29 @@
+{
+  "version": 10,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 23,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "apple-clang-with-tests",
+      "displayName": "AppleClang - With Tests",
+      "description": "macos build",
+      "generator": "Xcode",
+      "binaryDir": "${sourceDir}/build/with-tests",
+      "cacheVariables": {
+        "QRCODE_TESTS_ENABLED": {
+          "type": "BOOL",
+          "value": "ON"
+        }
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "build-apple-clang-with-tests",
+      "configurePreset": "apple-clang-with-tests"
+    }
+  ]
+}

LICENSE

@@ -1,5 +1,5 @@
 
-Copyright (c) 2021 Sebastian Bauer
+Copyright (c) 2025 Melissa Bauer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,14 +1,13 @@
 # Introduction
-libqrcode is C++20 header-only library for generating QR/Micro QR Codes.
+libqrcode is C++23 header-only library for generating QR/Micro QR Codes.
 
 Features include:
 * Header-only library
 * Completely constexpr
 * Code is (unit-)tested with `static_asserts` during compile-time
 * Utilizes standard library only
-* Uses C++20 Ranges
+* Uses Ranges
 * No C++ exceptions (however)
-* Supports Conan package manager
 
 # QR support
 Supported: 
@@ -29,13 +28,9 @@ Supported:
 * Encodings: Numeric, alphanumeric, byte and kanji encoding (where possible)
 
 # Usage
-One can either use the conan recipe provided in this repository or directly integrate the library 
-into your project. As this libary is header-only, it should be quite easy to setup. 
-Add the libqrcode include directory to your project's header search path
-
 In your project, just in include the header [`qrcode/qrcode.h`](include/qrcode/qrcode.h). 
-Micro QR api is located within namespace `micro_qr`.
-QR api is located within namespace `qr`.
+Micro QR API is located within namespace `micro_qr`.
+QR API is located within namespace `qr`.
 
 #### Simple example
 ```
@@ -89,41 +84,21 @@ int main()
 ```
 
 # Requirements
-* C++20 compiler and standard library
+* C++ compiler and standard library
 * Supported:
-   * gcc10 and libstdc++-10-dev or higher (see [`test/linux.Dockerfile`](test/linux.Dockerfile))
-   * msvc: Visual Studio 2019 16.10.0 (see [`test/win.Dockerfile`](test/win.Dockerfile))
-* Not supported: 
-  * clang doesn't seem to support all featured of C++20 needed to make this work
-  * macOS (due to lack of C++20 features), support will be added in the future
+   * gcc13 and libstdc++-13-dev
+   * clang15 and libstdc++-13-dev
+   * msvc: Visual Studio 2022 17.14.9
+   * macos: AppleClang 16.0.0
 
 # How to build
 * Since the library is header-only, building is actually not necessary.
-* Just put the `include` folder of this project into your header search path and it should just work.
+* Just place the `include` folder of this project into your header search path.
 * However, if you'd like to run the tests, please select the top-level of the project in order to run _CMake_.
-* For more information, please have a look at the _Dockerfile_ in the test folder and consider the remarks below.
 
 ## How to run the tests
-If you would like to run the tests, one has to add the following cmake flag: `-DQRCODE_TESTS_ENABLED:BOOL=True`
-
-## Debug builds using MSVC
-Building with tests enabled in _Debug_ configuration won't build due to an issue in _Microsoft_'s STL implementation. _Release_ configuration works though.
+If you would like to run the tests, one has to add the following _CMake_ flag: `-DQRCODE_TESTS_ENABLED:BOOL=True`
 
 # CI builds
-CI builds usually consists of a test build and a conan demo build. 
-If and only if both builds were successful, the CI state is green.
-
-# Tests
-All tests are usually built and run in docker containers.
-See [`test/linux.Dockerfile`](test/linux.Dockerfile) for more info.
-You can also hit [`test/linux_run.sh`](test/linux_run.sh) which creates and 
-runs the docker image for you.
-
-# Conan
-The library supports _Conan_ out of the box. The [`conan_demo/Dockerfile`](conan_demo/Dockerfile) 
-and [`conan_demo/run.sh`](conan_demo/run.sh) are for demonstration purposes.
-It creates a small command-line tool which can create QR symbols from a given text message.
-
-Please note: 
-The _Conan_ build is part of the CI checks. 
-The tool has to be compiled successfully in order to clear this stage.
+The CI pipeline consist of test builds and demo builds for _GCC_, _Clang_, _AppleClang_ and _MSVC_. 
+If and only if all builds were successful, the CI state is green.