Skip to content

Libraries update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MAIPA01 merged 3 commits into from
Apr 27, 2026
Merged

Libraries update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9741221
libraries versions update
MAIPA01 Apr 26, 2026
806b7c9
GLSL_STRUCT_EXPORT fix
MAIPA01 Apr 27, 2026
899d9fe
docs update
MAIPA01 Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 1 addition & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.30)
project(glslstruct VERSION 1.4.2 LANGUAGES CXX)
project(glslstruct VERSION 1.4.3 LANGUAGES CXX)

# variable for building shared library
option(GLSL_STRUCT_BUILD_TESTS "Build glsl struct tests" ${PROJECT_IS_TOP_LEVEL})
Expand Down Expand Up @@ -27,12 +27,6 @@ message(STATUS "GLSL_STRUCT_DISABLE_TYPES: ${GLSL_STRUCT_DISABLE_TYPES}")
message(STATUS "GLSL_STRUCT_ENABLE_TYPE_CHECKS: ${GLSL_STRUCT_ENABLE_TYPE_CHECKS}")
message(STATUS "GLSL_STRUCT_DISABLE_PARSER: ${GLSL_STRUCT_DISABLE_PARSER}")

if(BUILD_SHARED_LIBS)
set(BUILD_STATIC_LIBS OFF)
else()
set(BUILD_STATIC_LIBS ON)
endif()

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/third_party.cmake)

if (GLSL_STRUCT_ENABLE_CLANG_TIDY)
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PROJECT_NAME = "GLSL Struct"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.4.2
PROJECT_NUMBER = 1.4.3

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewers a
Expand Down
7 changes: 5 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,18 @@ Options can be enabled in c++ by `#define option_name` or by enabling cmake opti
| `GLSL_STRUCT_ENABLE_TYPE_CHECKS` | Enables type checking only if types are not disabled | OFF |
| `GLSL_STRUCT_DISABLE_PARSER` | Disables parsers functions | OFF |

There is additional define if you want to build shared lib `GLSL_STRUCT_SHARED_LIBS`. In cmake project this define is
set based on `BUILD_SHARED_LIBS` option.

### External libraries options

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

| Cmake option Name | Description | Default |
|:--------------------------------|:--------------------------------------------------------------------|:-------:|
| `GLSL_STRUCT_MSTD_EXTERNAL` | Uses users own mstd library (tested and compatible with: 1.5.2) | OFF |
| `GLSL_STRUCT_MSTD_EXTERNAL` | Uses users own mstd library (tested and compatible with: 1.5.3) | OFF |
| `GLSL_STRUCT_GLM_EXTERNAL` | Uses users own glm library (tested and compatible with: 1.0.3) | OFF |
| `GLSL_STRUCT_PCRE2CPP_EXTERNAL` | Uses users own pcre2cpp library (tested and compatible with: 1.2.5) | OFF |
| `GLSL_STRUCT_PCRE2CPP_EXTERNAL` | Uses users own pcre2cpp library (tested and compatible with: 1.2.6) | OFF |

### Project developing options

Expand Down
4 changes: 2 additions & 2 deletions cmake/third_party.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ endif()

if(DOWNLOAD_MSTD)
CPMAddPackage(
URI "gh:maipa01/mstd#v1.5.2"
URI "gh:maipa01/mstd#v1.5.3"
OPTIONS "MSTD_ENABLE_ENUMS_MACROS ON"
)
endif()

if(DOWNLOAD_PCRE2CPP)
CPMAddPackage(
URI "gh:maipa01/pcre2cpp#v1.2.5"
URI "gh:maipa01/pcre2cpp#v1.2.6"
OPTIONS "PCRE2CPP_USE_EXTERNAL_MSTD ON"
"PCRE2CPP_DISABLE_UTF16 ON"
"PCRE2CPP_DISABLE_UTF32 ON"
Expand Down
30 changes: 15 additions & 15 deletions docs/html/annotated.html
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/html/annotated_dup.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/html/classes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/concepts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d19/structstd_1_1hash_3_01glslstruct_1_1struct__type_01_4-members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d21/classglslstruct_1_1scalar__type-members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d24/conceptglslstruct_1_1utils_1_1layout__traits__opt__after__add__mat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d24/structglslstruct_1_1max__alignment__layout__context-members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d28/classglslstruct_1_1var__data-members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d2b/structstd_1_1hash_3_01glslstruct_1_1scalar__type_01_4-members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion ...0/d33/structstd_1_1hash_3_01glslstruct_1_1base__layout_3_01_traits_01_4_01_4-members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d6e/structstd_1_1hash_3_01glslstruct_1_1var__data_01_4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d6f/structstd_1_1hash_3_01glslstruct_1_1array__type_01_4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d77/classglslstruct_1_1base__layout-members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/d0/d94/conceptglslstruct_1_1utils_1_1layout__traits__opt__after__add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<tbody>
<tr id="projectrow">
<td id="projectalign">
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.2</span>
<div id="projectname">GLSL Struct<span id="projectnumber">&#160;1.4.3</span>
</div>
<div id="projectbrief">glslstruct</div>
</td>
Expand Down
Loading