Fixed building clanguml internal diagrams on macos (#210)

Add option to render diagrams after generation

cmake/GitVersion.cmake

@@ -13,9 +13,9 @@ function(setup_git_version)
         endif(GIT_EXECUTABLE)
     endif(NOT DEFINED GIT_VERSION)
 
-    if(NOT DEFINED GIT_VERSION)
+    if(NOT DEFINED GIT_VERSION OR "${GIT_VERSION}" STREQUAL "")
         set(GIT_VERSION "0.0.0-unknown")
-    endif(NOT DEFINED GIT_VERSION)
+    endif(NOT DEFINED GIT_VERSION OR "${GIT_VERSION}" STREQUAL "")
 
     string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.(.+)"
             GIT_VERSION_MATCH ${GIT_VERSION})
@@ -24,4 +24,4 @@ function(setup_git_version)
     set(GIT_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE)
     set(GIT_VERSION ${GIT_VERSION} PARENT_SCOPE)
 
-endfunction()
+endfunction()

src/common/generators/generators.h

@@ -397,7 +397,6 @@ std::unique_ptr<DiagramModel> generate(const common::compilation_database &db,
 /**
  * @brief Generate a single diagram
  *
- * @param od Output directory path
  * @param name Name of the diagram
  * @param diagram Effective diagram configuration
  * @param db Reference to compilation database
@@ -406,7 +405,7 @@ std::unique_ptr<DiagramModel> generate(const common::compilation_database &db,
  * @param verbose Log level
  * @param progress Function to report translation unit progress
  */
-void generate_diagram(const std::string &od, const std::string &name,
+void generate_diagram(const std::string &name,
     std::shared_ptr<clanguml::config::diagram> diagram,
     const common::compilation_database &db,
     const std::vector<std::string> &translation_units,
@@ -441,4 +440,4 @@ void generate_diagrams(const std::vector<std::string> &diagram_names,
  */
 indicators::Color diagram_type_to_color(model::diagram_t diagram_type);
 
-} // namespace clanguml::common::generators
+} // namespace clanguml::common::generators

src/sequence_diagram/visitor/translation_unit_visitor.cc

@@ -1940,7 +1940,7 @@ void translation_unit_visitor::process_template_specialization_argument(
                     .getAsTemplateDecl()
                     ->getQualifiedNameAsString();
 
-            argument.set_name(nested_template_name);
+            argument.set_type(nested_template_name);
 
             auto nested_template_instantiation = build_template_instantiation(
                 *nested_template_type, &template_instantiation);

uml/sequence/cli_handle_options_sequence.yml

@@ -10,7 +10,6 @@ glob:
 include:
   namespaces:
     - clanguml
-    - YAML
 exclude:
   elements:
     - r: "clanguml::config::option.*"
@@ -21,4 +20,4 @@ exclude:
 using_namespace:
   - clanguml
 from:
-  - function: "clanguml::cli::cli_handler::handle_options(int,const char **)"
+  - function: "clanguml::cli::cli_handler::handle_options(int,const char **)"

uml/sequence/diagram_generate_generic_sequence.yml

@@ -13,4 +13,4 @@ exclude:
   paths:
     - src/common/model/source_location.h
 from:
-  - function: "clanguml::common::generators::generate_diagram(const std::string &,const std::string &,std::shared_ptr<clanguml::config::diagram>,const common::compilation_database &,const std::vector<std::string> &,const cli::runtime_config &,std::function<void ()> &&)"
+  - function: "clanguml::common::generators::generate_diagram(const std::string &,std::shared_ptr<clanguml::config::diagram>,const common::compilation_database &,const std::vector<std::string> &,const cli::runtime_config &,std::function<void ()> &&)"

uml/sequence/load_config_sequence.yml

@@ -8,7 +8,6 @@ glob:
 include:
   namespaces:
     - clanguml
-    - YAML
 exclude:
   elements:
     - r: "clanguml::config::option.*"
@@ -17,4 +16,4 @@ exclude:
 using_namespace:
   - clanguml
 from:
-  - function: "clanguml::config::load(const std::string &,std::optional<bool>,std::optional<bool>,bool)"
+  - function: "clanguml::config::load(const std::string &,bool,std::optional<bool>,std::optional<bool>,bool)"