Merge pull request #156 from bkryza/v0.3.7

V0.3.7

CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+### 0.3.7
   * Added regexp support to selected diagram filters (#51, #132)
   * Added method type diagram filter (#145)
   * Added default method grouping and sorting in class diagrams (#36)

README.md

@@ -4,7 +4,7 @@
 
 [![Build status](https://github.com/bkryza/clang-uml/actions/workflows/build.yml/badge.svg)](https://github.com/bkryza/clang-uml/actions)
 [![Coverage](https://codecov.io/gh/bkryza/clang-uml/branch/master/graph/badge.svg)](https://codecov.io/gh/bkryza/clang-uml)
-[![Version](https://img.shields.io/badge/version-0.3.6-blue)](https://github.com/bkryza/clang-uml/releases)
+[![Version](https://img.shields.io/badge/version-0.3.7-blue)](https://github.com/bkryza/clang-uml/releases)
 [![Version](https://img.shields.io/badge/LLVM-12,13,14,15,16-orange)](https://github.com/bkryza/clang-uml/releases)
 
 `clang-uml` is an automatic C++ to UML class, sequence, package and include diagram generator, driven by 

packaging/README.md

@@ -46,8 +46,7 @@ First build release configuration using `cmake` and `msbuild` according
 to the [documentation](../docs/installation.md#visual-studio-native-build).
 
 ```bash
-cmake -S clang-uml -B .\clang-uml-build-pkg\ -DCMAKE_PREFIX_PATH="C:\clang-uml" -Thost=x64
+cd packaging
-cd .\clang-uml-build-pkg\
+.\make_installer.ps1
-msbuild .\clang-uml.vcxproj -maxcpucount /p:Configuration=RelWithDebInfo
+ls .\_BUILD\windows\clang-uml-0.3.7-win64.exe
-cpack -C "RelWithDebInfo" -G NSIS64
 ```

packaging/conda/build.sh

@@ -10,7 +10,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \
 	  -DGIT_VERSION=${GIT_VERSION} \
 	  -DCODE_COVERAGE=OFF \
 	  -DBUILD_TESTS=OFF \
-	  -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \
+	  -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow -Wno-dangling-reference" \
 	  -DLLVM_CONFIG_PATH=${BUILD_PREFIX}/bin/llvm-config \
 	  -DCONDA_BUILD_PREFIX=${BUILD_PREFIX} \
 	  -DCMAKE_INSTALL_PREFIX=${PREFIX} \

packaging/make_installer.ps1

@@ -0,0 +1,18 @@
+# This script assumes that all clang-uml dependencies are instaled in C:\clang-uml
+
+param ($Prefix="C:\clang-uml", $BuildType="Release")
+
+mkdir _BUILD
+
+cmake -S .. -B .\_BUILD\windows\ -DCMAKE_PREFIX_PATH="$Prefix" -Thost=x64
+
+cd .\_BUILD\windows\src
+
+msbuild .\clang-uml.vcxproj -maxcpucount /p:Configuration=Release
+
+cd ..
+
+cpack -C "Release" -G NSIS64 
+
+cd ..
+cd ..

tests/CMakeLists.txt

@@ -5,7 +5,7 @@ file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml
                                    test_compilation_database_data/*.yml
                                    test_compilation_database_data/*.json)
 
-set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059)
+set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065)
 
 set(CLANG_UML_TEST_LIBRARIES
         clang-umllib