Skip to content

Commit f41d649

Browse files
authored
Mstd update and shared libs fix (#2)
* mstd update and shared libs fix * docs update * clang-format fixes
1 parent d2560db commit f41d649

88 files changed

Lines changed: 641 additions & 568 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.30)
2-
project(pcre2cpp VERSION 1.2.5 LANGUAGES CXX)
2+
project(pcre2cpp VERSION 1.2.6 LANGUAGES CXX)
33

44
option(BUILD_SHARED_LIBS "Build shared library" OFF)
55
option(PCRE2CPP_BUILD_TESTS "Build tests" ${PROJECT_IS_TOP_LEVEL})
@@ -12,7 +12,7 @@ option(PCRE2CPP_ENABLE_CLANG_TIDY "Enables clang-tidy checks" ${PROJECT_IS_T
1212
option(PCRE2CPP_INSTALL "Enables installation of this project" ${PROJECT_IS_TOP_LEVEL})
1313
option(PCRE2CPP_INSTALL_TEST "This is only to test if installation of pcre2cpp works" OFF)
1414

15-
option(PCRE2CPP_MSTD_EXTERNAL "Uses users own mstd library (tested and compatible with: 1.5.2)" OFF)
15+
option(PCRE2CPP_MSTD_EXTERNAL "Uses users own mstd library (tested and compatible with: 1.5.3)" OFF)
1616
option(PCRE2CPP_PCRE2_EXTERNAL "Uses users own pcre2 library (tested and compatible with: 10.47)" OFF)
1717

1818
option(PCRE2CPP_ENABLE_CXX20 "Enables C++20 features" OFF)
@@ -29,6 +29,12 @@ message(STATUS "PCRE2CPP_DISABLE_UTF8: ${PCRE2CPP_DISABLE_UTF8}")
2929
message(STATUS "PCRE2CPP_DISABLE_UTF16: ${PCRE2CPP_DISABLE_UTF16}")
3030
message(STATUS "PCRE2CPP_DISABLE_UTF32: ${PCRE2CPP_DISABLE_UTF32}")
3131

32+
if(${BUILD_SHARED_LIBS})
33+
set(BUILD_STATIC_LIBS OFF)
34+
else()
35+
set(BUILD_STATIC_LIBS ON)
36+
endif()
37+
3238
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/third_party.cmake)
3339

3440
if (PCRE2CPP_ENABLE_CLANG_TIDY)

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ PROJECT_NAME = "PCRE2 C++ Wrapper"
4848
# could be handy for archiving the generated documentation or if some version
4949
# control system is used.
5050

51-
PROJECT_NUMBER = 1.2.4
51+
PROJECT_NUMBER = 1.2.6
5252

5353
# Using the PROJECT_BRIEF tag one can provide an optional one line description
5454
# for a project that appears at the top of each page and should give viewers a

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@ You can enable option using `#define option_name` or use cmake `set(option_name
3030
| `PCRE2CPP_DISABLE_UTF16` | Disables UTF-16 support | OFF |
3131
| `PCRE2CPP_DISABLE_UTF32` | Disables UTF-32 support | OFF |
3232

33+
There is additional define if you want to use pcre2 as shared library insted of static `PCRE2CPP_SHARED_LIB`. In cmake
34+
project its value depends on `BUILD_SHARED_LIBS` option
35+
3336
### External libraries options
3437

3538
If you want to use external libraries not installed by project using CPM
3639

3740
| Cmake option Name | Description | Default |
3841
|:--------------------------|:-----------------------------------------------------------------|:-------:|
39-
| `PCRE2CPP_MSTD_EXTERNAL` | Uses users own mstd library (tested and compatible with: 1.5.2) | OFF |
42+
| `PCRE2CPP_MSTD_EXTERNAL` | Uses users own mstd library (tested and compatible with: 1.5.3) | OFF |
4043
| `PCRE2CPP_PCRE2_EXTERNAL` | Uses users own pcre2 library (tested and compatible with: 10.47) | OFF |
4144

4245
### Project developing options
@@ -341,5 +344,6 @@ the [LICENSE](./LICENSE "License") file.
341344

342345
## Acknowledgments
343346

344-
This project includes code from the [PCRE2 library](https://github.com/PhilipHazel/pcre2 "PCRE2 github repo"), distributed under the BSD
347+
This project includes code from the [PCRE2 library](https://github.com/PhilipHazel/pcre2 "PCRE2 github repo"),
348+
distributed under the BSD
345349
License.

cmake/third_party.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ endif()
5656

5757
# MSTD
5858
if (DOWNLOAD_MSTD)
59-
CPMAddPackage("gh:maipa01/mstd#v1.5.2")
59+
CPMAddPackage("gh:maipa01/mstd#v1.5.3")
6060
endif()
6161

6262
# GTEST

docs/html/annotated.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<tbody>
2828
<tr id="projectrow">
2929
<td id="projectalign">
30-
<div id="projectname">PCRE2 C++ Wrapper<span id="projectnumber">&#160;1.2.4</span>
30+
<div id="projectname">PCRE2 C++ Wrapper<span id="projectnumber">&#160;1.2.6</span>
3131
</div>
3232
<div id="projectbrief">pcre2cpp</div>
3333
</td>

docs/html/classes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<tbody>
2828
<tr id="projectrow">
2929
<td id="projectalign">
30-
<div id="projectname">PCRE2 C++ Wrapper<span id="projectnumber">&#160;1.2.4</span>
30+
<div id="projectname">PCRE2 C++ Wrapper<span id="projectnumber">&#160;1.2.6</span>
3131
</div>
3232
<div id="projectbrief">pcre2cpp</div>
3333
</td>

docs/html/d1/d3f/match__result_8hpp_source.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<tbody>
2828
<tr id="projectrow">
2929
<td id="projectalign">
30-
<div id="projectname">PCRE2 C++ Wrapper<span id="projectnumber">&#160;1.2.4</span>
30+
<div id="projectname">PCRE2 C++ Wrapper<span id="projectnumber">&#160;1.2.6</span>
3131
</div>
3232
<div id="projectbrief">pcre2cpp</div>
3333
</td>

docs/html/d1/d3f/namespacepcre2cpp_1_1utils.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<tbody>
2828
<tr id="projectrow">
2929
<td id="projectalign">
30-
<div id="projectname">PCRE2 C++ Wrapper<span id="projectnumber">&#160;1.2.4</span>
30+
<div id="projectname">PCRE2 C++ Wrapper<span id="projectnumber">&#160;1.2.6</span>
3131
</div>
3232
<div id="projectbrief">pcre2cpp</div>
3333
</td>

0 commit comments

Comments
 (0)