3 Commits

Author SHA1 Message Date
Petra Baranski
441ba25550 docs: update changelog with 1.6.0
Some checks failed
run-checks / run-clang-format (push) Has been cancelled
run-tests / test-on-ubuntu (push) Has been cancelled
run-tests / test-on-windows (push) Has been cancelled
run-tests / test-on-osx (push) Has been cancelled
Update dependency versions / update-fetch-content (push) Has been cancelled
2025-07-26 15:28:47 +02:00
Petra Baranski
9143754a23 chore: bump version to 1.6.0 2025-07-26 15:28:47 +02:00
Petra Baranski
de67274233 chore: add cmake find_package test
Some checks failed
run-checks / run-clang-format (push) Has been cancelled
run-tests / test-on-ubuntu (push) Has been cancelled
run-tests / test-on-windows (push) Has been cancelled
run-tests / test-on-osx (push) Has been cancelled
2025-07-25 06:33:24 +02:00
8 changed files with 61 additions and 10 deletions

View File

@@ -12,17 +12,26 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: lukka/get-cmake@latest - uses: lukka/get-cmake@latest
with: with:
cmakeVersion: "~3.25.0" # <--= optional, use most recent 3.25.x version cmakeVersion: "~3.25.0"
ninjaVersion: "^1.11.1" # <--= optional, use most recent 1.x version ninjaVersion: "^1.11.1"
- name: build - name: build
run: | run: |
mkdir tmp mkdir tmp
cd tmp cd tmp
cmake -DMADDY_BUILD_WITH_TESTS=ON .. cmake -DMADDY_BUILD_WITH_TESTS=ON -DCMAKE_INSTALL_PREFIX=./install ..
make -j4 make -j4
make install
- name: run tests - name: run tests
run: | run: |
./build/MaddyTests ./build/MaddyTests
- name: test find_package
run: |
cd tests/cmake/find_package
mkdir tmp
cd tmp
cmake -DCMAKE_PREFIX_PATH=../../../tmp/install ..
make -j4
./maddy_find_package_example
test-on-windows: test-on-windows:
runs-on: windows-latest runs-on: windows-latest
@@ -30,8 +39,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: lukka/get-cmake@latest - uses: lukka/get-cmake@latest
with: with:
cmakeVersion: "~3.25.0" # <--= optional, use most recent 3.25.x version cmakeVersion: "~3.25.0"
ninjaVersion: "^1.11.1" # <--= optional, use most recent 1.x version ninjaVersion: "^1.11.1"
- name: build - name: build
run: | run: |
mkdir tmp mkdir tmp
@@ -48,8 +57,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: lukka/get-cmake@latest - uses: lukka/get-cmake@latest
with: with:
cmakeVersion: "~3.25.0" # <--= optional, use most recent 3.25.x version cmakeVersion: "~3.25.0"
ninjaVersion: "^1.11.1" # <--= optional, use most recent 1.x version ninjaVersion: "^1.11.1"
- name: build - name: build
run: | run: |
mkdir tmp mkdir tmp

View File

@@ -14,6 +14,10 @@ maddy uses [semver versioning](https://semver.org/).
## Upcoming ## Upcoming
* ...
## version 1.6.0 2025-07-26
* ![**ADDED**](https://img.shields.io/badge/-ADDED-%23099) Added CMake install and find_package() support. * ![**ADDED**](https://img.shields.io/badge/-ADDED-%23099) Added CMake install and find_package() support.
* ![**ADDED**](https://img.shields.io/badge/-ADDED-%23099) Script to update maddy version number in all files. * ![**ADDED**](https://img.shields.io/badge/-ADDED-%23099) Script to update maddy version number in all files.

View File

@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.25) cmake_minimum_required(VERSION 3.25)
project(maddy VERSION 1.5.0) # MADDY_VERSION_LINE_REPLACEMENT project(maddy VERSION 1.6.0) # MADDY_VERSION_LINE_REPLACEMENT
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

View File

@@ -1,7 +1,7 @@
# maddy # maddy
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-brightgreen.svg)](https://semver.org/) <!-- MADDY_VERSION_LINE_REPLACEMENT --> [![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-brightgreen.svg)](https://semver.org/) <!-- MADDY_VERSION_LINE_REPLACEMENT -->
maddy is a C++ Markdown to HTML **header-only** parser library. maddy is a C++ Markdown to HTML **header-only** parser library.

View File

@@ -59,7 +59,7 @@ public:
*/ */
static const std::string& version() static const std::string& version()
{ {
static const std::string v = "1.5.0"; // MADDY_VERSION_LINE_REPLACEMENT static const std::string v = "1.6.0"; // MADDY_VERSION_LINE_REPLACEMENT
return v; return v;
} }

View File

@@ -0,0 +1,8 @@
# This project is licensed under the MIT license. For more information see the
# LICENSE file.
cmake_minimum_required(VERSION 3.25)
find_package(maddy REQUIRED)
add_executable(maddy_find_package_example main.cpp)
target_link_libraries(maddy_find_package_example PRIVATE maddy::maddy)

View File

@@ -0,0 +1,25 @@
/*
* This project is licensed under the MIT license. For more information see the
* LICENSE file.
*
* This file is a tiny example project to test if find_package works correctly.
*/
#include <iostream>
#include <memory>
#include <sstream>
#include <string>
#include "maddy/parser.h"
int main(int argc, char** argv)
{
std::shared_ptr<maddy::Parser> parser = std::make_shared<maddy::Parser>();
std::stringstream markdownStream;
markdownStream << "# Hello World\n"
<< "This is a **bold** text and this is *italic* text.\n";
std::cout << parser->Parse(markdownStream) << std::endl;
return 0;
}

View File

@@ -70,6 +70,11 @@ def format_files(dry_run):
files_to_format = [] files_to_format = []
for pattern in patterns: for pattern in patterns:
matched_files = glob.glob(pattern, recursive=True) matched_files = glob.glob(pattern, recursive=True)
for file in matched_files:
if '\/tmp\/' in file or '\\tmp\\' in file:
matched_files.remove(file)
files_to_format.extend(matched_files) files_to_format.extend(matched_files)
if not files_to_format: if not files_to_format: