Merge pull request #103 from bkryza/v0.3.2

V0.3.2

CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+### 0.3.2
   * Added initial support for C++20 concept rendering (#96)
   * Added support for plain C11 translation units (#97)
   * Added 'row' and 'column' layout hints for aligning elements (#90)

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.1-blue)](https://github.com/bkryza/clang-uml/releases)
+[![Version](https://img.shields.io/badge/version-0.3.2-blue)](https://github.com/bkryza/clang-uml/releases)
 
 
 `clang-uml` is an automatic C++ to UML class, sequence, package and include diagram generator, driven by 

cmake/GitVersion.cmake

@@ -14,7 +14,7 @@ function(setup_git_version)
     endif(NOT DEFINED GIT_VERSION)
 
     if(NOT DEFINED GIT_VERSION)
-        set(GIT_VERSION "0.0.0-unknown" PARENT_SCOPE)
+        set(GIT_VERSION "0.0.0-unknown")
     endif(NOT DEFINED GIT_VERSION)
 
     string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.(.+)"
@@ -22,4 +22,6 @@ function(setup_git_version)
     set(GIT_VERSION_MAJOR ${CMAKE_MATCH_1} PARENT_SCOPE)
     set(GIT_VERSION_MINOR ${CMAKE_MATCH_2} PARENT_SCOPE)
     set(GIT_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE)
+    set(GIT_VERSION ${GIT_VERSION} PARENT_SCOPE)
+
 endfunction()

packaging/debian/control.jammy

@@ -2,7 +2,7 @@ Source: clang-uml
 Maintainer: Bartek Kryza <bkryza@gmail.com>
 Section: devel
 Priority: optional
-Build-Depends: debhelper, make, gcc-12, g++-12, cmake (>= 3.16), libyaml-cpp-dev, llvm-14, llvm-14-dev, clang-14, libclang-14-dev, libclang-cpp14-dev
+Build-Depends: debhelper, make, gcc-12, g++-12, cmake (>= 3.16), libyaml-cpp-dev, llvm-15, llvm-15-dev, clang-15, libclang-15-dev, libclang-cpp15-dev
 Standards-Version: 4.3.0
 Vcs-Browser: https://github.com/bkryza/clang-uml
 Vcs-Git: https://github.com/bkryza/clang-uml.git
@@ -12,7 +12,7 @@ Homepage: https://github.com/bkryza/clang-uml
 Package: clang-uml
 Architecture: any
 Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}, clang-14
+Depends: ${misc:Depends}, ${shlibs:Depends}, clang-15
 Pre-Depends: ${misc:Pre-Depends}
 Description: Automatic C++ UML diagram generator based on Clang.
  .

packaging/debian/rules

@@ -14,7 +14,7 @@ override_dh_auto_configure:
 	                                         -DBUILD_TESTS=OFF
 
 override_dh_strip:
-	dh_strip --dbgsym-migration='clang-uml-dbg (<<0.3.0-1~)'
+	dh_strip --dbgsym-migration='clang-uml-dbg (<<{{VERSION}}-1~)'
 
 %:
 	dh $@

packaging/fedora/clang-uml.spec

@@ -35,18 +35,18 @@ generated in PlantUML format.
 %setup -q -n clang-uml-%{version}
 
 %build
-cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-        -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \
-        -DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
-        -DCMAKE_INSTALL_PREFIX=%{_exec_prefix} \
-        -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-        -DGIT_VERSION=%{version} \
-        -DBUILD_TESTS=OFF
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+       -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \
+       -DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
+       -DCMAKE_INSTALL_PREFIX=%{_exec_prefix} \
+       -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+       -DGIT_VERSION=%{version} \
+       -DBUILD_TESTS=OFF
 
-make %{_smp_mflags} clang-uml
+%cmake_build
 
 %install
-%make_install
+%cmake_install
 rm -f %{buildroot}/%{_infodir}/dir
 
 %post

src/CMakeLists.txt

@@ -59,10 +59,15 @@ target_link_libraries(clang-uml
 include(GNUInstallDirs)
 
 install(TARGETS clang-uml DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
-install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
-install(FILES AUTHORS.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
-install(FILES CHANGELOG.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+install(FILES ${PROJECT_SOURCE_DIR}/LICENSE.md
+        DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install(FILES ${PROJECT_SOURCE_DIR}/README.md
+        DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install(FILES ${PROJECT_SOURCE_DIR}/AUTHORS.md
+        DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install(FILES ${PROJECT_SOURCE_DIR}/CHANGELOG.md
+        DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
 #
 # Setup installer