Coding - Bump version to 7.9.1

Fixed PCH issue for mac os

.clang-format

@@ -0,0 +1,41 @@
+# clang-format configuration file trying to apply OCCT coding style
+#
+# Clang formatting rules: https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+# The clang-format npm package (https://github.com/angular/clang-format) uses
+# a pre-built clang-format.exe from http://llvm.org/builds/
+#
+# We use defaults from the Microsoft style
+BasedOnStyle: Microsoft
+#
+# Style options
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowAllArgumentsOnNextLine: false
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: Consecutive
+AlignConsecutiveDeclarations: Consecutive
+AlignTrailingComments: true
+AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeTernaryOperators: true
+ColumnLimit: 100
+ContinuationIndentWidth: 2
+IndentCaseLabels: true
+IndentPPDirectives: BeforeHash
+IndentWidth: 2
+IndentWrappedFunctionNames: true
+PackConstructorInitializers: Never
+PointerAlignment: Left
+ReferenceAlignment: Left
+SeparateDefinitionBlocks: Always
+SortIncludes: false
+UseTab: Never
+#
+# OCCT specific settings
+StatementMacros:
+  - Standard_FALLTHROUGH
+  - Standard_DEPRECATED
+TypenameMacros:
+  - Handle

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Global formatting with new rules using clang-format 18.1.8
+a5a7b3185b83c39d5b26cfaf138b9b87b5776e59

.github/ISSUE_TEMPLATE/Application Framework Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Application Framework Bug Report"
-description: "Report a bug related to the Application Framework"
-labels: ["1. Application Framework", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Application Framework Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Application Framework Feature Request"
-description: "Request a new feature or enhancement for the Application Framework"
-labels: ["1. Application Framework", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Bug Report.yaml

@@ -1,6 +1,6 @@
-name: "DRAW Bug Report"
-description: "Report a bug related to DRAW"
-labels: ["1. 2. Bug", "DRAW"]
+name: "Bug Report"
+description: "Report a bug related to the OCCT"
+labels: ["2. Bug", "0. New"]
 body:
   - type: markdown
     attributes:
@@ -43,6 +43,7 @@ body:
         - Linux
         - Windows
         - macOS
+      default: 0
     validations:
       required: true
   - type: dropdown
@@ -54,13 +55,9 @@ body:
         - GCC
         - Clang
         - MSVC
+      default: 0
     validations:
       required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
   - type: dropdown
     id: bitness
     attributes:
@@ -69,6 +66,7 @@ body:
       options:
         - 32-bit
         - 64-bit
+      default: 1
     validations:
       required: true
   - type: dropdown
@@ -80,21 +78,13 @@ body:
         - 7.4
         - 7.5
         - 7.6
+        - 7.7
         - 7.8
         - 7.9
         - latest
+      default: 6
     validations:
       required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
   - type: textarea
     id: additional_files
     attributes:

.github/ISSUE_TEMPLATE/Build Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Build Bug Report"
-description: "Report a bug related to the build process"
-labels: ["1. Build", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Build Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Build Feature Request"
-description: "Request a new feature or enhancement for the build process"
-labels: ["1. Build", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Coding Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Coding Bug Report"
-description: "Report a bug related to coding"
-labels: ["1. Coding", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Coding Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Coding Feature Request"
-description: "Request a new feature or enhancement for coding"
-labels: ["1. Coding", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Configuration Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Configuration Bug Report"
-description: "Report a bug related to configuration"
-labels: ["1. Configuration", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Configuration Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Configuration Feature Request"
-description: "Request a new feature or enhancement for configuration"
-labels: ["1. Configuration", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Data Exchange Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Data Exchange Bug Report"
-description: "Report a bug related to data exchange"
-labels: ["1. Data Exchange", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Data Exchange Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Data Exchange Feature Request"
-description: "Request a new feature or enhancement for data exchange"
-labels: ["1. Data Exchange", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Documentation Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Documentation Bug Report"
-description: "Report a bug related to documentation"
-labels: ["1. Documentation", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Documentation Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Documentation Feature Request"
-description: "Request a new feature or enhancement for documentation"
-labels: ["1. Documentation", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Feature Request.yaml

@@ -1,6 +1,6 @@
-name: "DRAW Feature Request"
-description: "Request a new feature related to DRAW"
-labels: ["1. Enhancement", "DRAW"]
+name: "Feature Request"
+description: "Request a new feature or enhancement for the OCCT"
+labels: ["2. Enhancement", "0. New"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/Foundation Classes Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Foundation Classes Bug Report"
-description: "Report a bug related to Foundation Classes"
-labels: ["1. Foundation Classes", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Foundation Classes Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Foundation Classes Feature Request"
-description: "Request a new feature or enhancement for Foundation Classes"
-labels: ["1. Foundation Classes", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Mesh Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Mesh Bug Report"
-description: "Report a bug related to Mesh"
-labels: ["1. Mesh", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Mesh Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Mesh Feature Request"
-description: "Request a new feature or enhancement for Mesh"
-labels: ["1. Mesh", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Modeling Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Modeling Bug Report"
-description: "Report a bug related to Modeling"
-labels: ["1. Modeling", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Modeling Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Modeling Feature Request"
-description: "Request a new feature or enhancement for Modeling"
-labels: ["1. Modeling", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Samples Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Samples Bug Report"
-description: "Report a bug related to Samples"
-labels: ["1. Samples", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Samples Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Samples Feature Request"
-description: "Request a new feature or enhancement for Samples"
-labels: ["1. Samples", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Shape Healing Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Shape Healing Bug Report"
-description: "Report a bug related to Shape Healing"
-labels: ["1. Shape Healing", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Shape Healing Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Shape Healing Feature Request"
-description: "Request a new feature or enhancement for Shape Healing"
-labels: ["1. Shape Healing", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Testing Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Testing Bug Report"
-description: "Report a bug related to Testing"
-labels: ["1. Testing", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Testing Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Testing Feature Request"
-description: "Request a new feature or enhancement for Testing"
-labels: ["1. Testing", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/ISSUE_TEMPLATE/Visualization Bug Report.yaml

@@ -1,102 +0,0 @@
-name: "Visualization Bug Report"
-description: "Report a bug related to Visualization"
-labels: ["1. Visualization", "2. Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the bug"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: "What you expected to happen"
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual Behavior
-      description: "What actually happened"
-    validations:
-      required: true
-  - type: textarea
-    id: sample_code
-    attributes:
-      label: Sample Code or DRAW Tcl Script
-      description: "Provide a C++ sample or DRAW Tcl script to reproduce the issue"
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Operating System
-      description: "Select the operating system"
-      options:
-        - Linux
-        - Windows
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-    validations:
-      required: true
-  - type: input
-    id: compiler_version
-    attributes:
-      label: Compiler Version
-      description: "Specify the compiler version (optional)"
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-    validations:
-      required: true
-  - type: dropdown
-    id: occt_version
-    attributes:
-      label: OCCT Version
-      description: "Select the OCCT version where the issue was detected"
-      options:
-        - 7.4
-        - 7.5
-        - 7.6
-        - 7.8
-        - 7.9
-        - latest
-    validations:
-      required: true
-  - type: input
-    id: precise_occt_version
-    attributes:
-      label: Precise OCCT Version or Branch
-      description: "Specify the precise OCCT version, branch, or SSH (optional)"
-  - type: input
-    id: environment
-    attributes:
-      label: Environment
-      description: "Details about your environment (OS, compiler, etc.)"
-  - type: textarea
-    id: additional_files
-    attributes:
-      label: Additional Files
-      description: "Attach any additional files that may help in reproducing the issue"

.github/ISSUE_TEMPLATE/Visualization Feature Request.yaml

@@ -1,34 +0,0 @@
-name: "Visualization Feature Request"
-description: "Request a new feature or enhancement for Visualization"
-labels: ["1. Visualization", "2. Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **Please provide the following information:**
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: "A detailed description of the feature request"
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: "Describe the use case for the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: "Explain the benefits of the feature"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional Context
-      description: "Any additional context or information"

.github/actions/build-docs/action.yml

@@ -0,0 +1,46 @@
+name: Build Documentation
+description: 'Build OCCT documentation using doxygen'
+
+runs:
+  using: composite
+  steps:
+    - name: Install dependencies
+      run: |
+        choco install -y graphviz
+        choco install -y doxygen.install
+      shell: pwsh
+
+    - name: Build refman documentation
+      run: |
+        set PATH=%PATH%;C:\Program Files\doxygen\bin;C:\Program Files\Graphviz\bin;C:\Program Files\doxygen
+        cd adm
+        bash gendoc -refman
+      shell: cmd
+
+    - name: Upload refman documentation
+      uses: actions/upload-artifact@v4.4.3
+      with:
+        name: refman-doc
+        path: doc/refman
+        retention-days: 90
+
+    - name: Upload generation log
+      uses: actions/upload-artifact@v4.4.3
+      with:
+        name: doxygen.log
+        path: doc/html_doxygen_err.log
+        retention-days: 90
+
+    - name: Build documentation Overview
+      run: |
+        set PATH=%PATH%;C:\Program Files\doxygen\bin;C:\Program Files\Graphviz\bin;C:\Program Files\doxygen
+        cd adm
+        bash gendoc -overview
+      shell: cmd
+
+    - name: Upload overview documentation
+      uses: actions/upload-artifact@v4.4.3
+      with:
+        name: overview-doc
+        path: doc/overview
+        retention-days: 90

.github/actions/build-sample-csharp/action.yml

@@ -0,0 +1,57 @@
+name: 'Build CSharp Sample'
+description: 'Build CSharp sample using OCCT installation'
+
+inputs:
+  platform:
+    description: 'Build platform (windows)'
+    required: true
+  install-artifact-name:
+    description: 'OCCT installation artifact name'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Download OCCT installation
+      uses: actions/download-artifact@v4.1.7
+      with:
+        name: ${{ inputs.install-artifact-name }}
+        path: occt-install
+
+    - name: Build CSharp Sample
+      if: inputs.platform == 'windows'
+      shell: cmd
+      run: |
+        REM Setup environment
+        call "${{ github.workspace }}\occt-install\env.bat" vc14 win64 Release
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x64
+        set "PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE;%PATH%"
+
+        cd ${{ github.workspace }}/samples/CSharp
+
+        REM First upgrade solutions to VS2022
+        echo "Upgrading solution files to VS2022..."
+        devenv.exe CSharp.sln /upgrade
+        devenv.exe CSharp_D3D.sln /upgrade
+
+        REM Update project platform toolset
+        powershell -Command "(Get-Content OCCTProxy\OCCTProxy.vcxproj) -replace '<PlatformToolset>v100</PlatformToolset>', '<PlatformToolset>v143</PlatformToolset>' | Set-Content OCCTProxy\OCCTProxy.vcxproj"
+        powershell -Command "(Get-Content OCCTProxy_D3D\OCCTProxy_D3D.vcxproj) -replace '<PlatformToolset>v100</PlatformToolset>', '<PlatformToolset>v143</PlatformToolset>' | Set-Content OCCTProxy_D3D\OCCTProxy_D3D.vcxproj"
+
+        REM Restore NuGet packages
+        echo "Upgrading solution files..."
+        msbuild.exe CSharp.sln -t:Restore -p:Configuration=Release -p:Platform=x64 /consoleloggerparameters:Verbosity=normal;Summary /flp:LogFile=restore_csharp.log;Verbosity=detailed
+        msbuild.exe CSharp_D3D.sln -t:Restore -p:Configuration=Release -p:Platform=x64 /consoleloggerparameters:Verbosity=normal;Summary /flp:LogFile=restore_d3d.log;Verbosity=detailed
+        
+        REM Build solutions with real-time console output
+        echo "Building CSharp.sln..."
+        msbuild.exe CSharp.sln /p:Configuration=Release /p:Platform=x64 /consoleloggerparameters:Verbosity=normal;Summary /flp:LogFile=build_csharp.log;Verbosity=detailed /m
+        echo "Building CSharp_D3D.sln..."
+        msbuild.exe CSharp_D3D.sln /p:Configuration=Release /p:Platform=x64 /consoleloggerparameters:Verbosity=normal;Summary /flp:LogFile=build_d3d.log;Verbosity=detailed /m
+
+    - name: Upload CSharp Sample
+      uses: actions/upload-artifact@v4.4.3
+      with:
+        name: csharp-sample-${{ inputs.platform }}-x64
+        path: samples/CSharp
+        retention-days: 7

.github/actions/build-sample-mfc/action.yml

@@ -0,0 +1,54 @@
+name: 'Build MFC Sample'
+description: 'Build MFC sample using OCCT installation'
+
+inputs:
+  platform:
+    description: 'Build platform (windows)'
+    required: true
+  install-artifact-name:
+    description: 'OCCT installation artifact name'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Download OCCT installation 
+      uses: actions/download-artifact@v4.1.7
+      with:
+        name: ${{ inputs.install-artifact-name }}
+        path: occt-install
+
+    - name: Build MFC Sample
+      if: inputs.platform == 'windows'
+      shell: cmd
+      run: |
+        REM Setup environment
+        call "${{ github.workspace }}\occt-install\env.bat" vc14 win64 Release
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x64
+
+        cd ${{ github.workspace }}/samples/mfc/standard
+        set "PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE;%PATH%"
+        
+        REM First restore the solution
+        echo "Restoring solution..."
+        msbuild.exe ALL-vc14.sln -t:Restore -p:Configuration=Release -p:Platform=x64 /consoleloggerparameters:Verbosity=normal;Summary /flp:LogFile=restore.log;Verbosity=detailed
+        
+        REM Build solution with detailed logging
+        echo "Building solution..."
+        msbuild.exe ALL-vc14.sln /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v143 /consoleloggerparameters:Verbosity=normal;Summary /flp:LogFile=build.log;Verbosity=detailed /m
+
+        REM Display logs if build fails
+        if errorlevel 1 (
+          echo "Build failed. Contents of restore.log:"
+          type restore.log
+          echo "Contents of build.log:"
+          type build.log
+          exit /b 1
+        )
+
+    - name: Upload MFC Sample
+      uses: actions/upload-artifact@v4.4.3
+      with:
+        name: mfc-sample-${{ inputs.platform }}-x64
+        path: samples/mfc/
+        retention-days: 7

.github/actions/build-sample-qt/action.yml

@@ -0,0 +1,108 @@
+name: 'Build Qt Sample'
+description: 'Build Qt samples using OCCT installation'
+
+inputs:
+  platform:
+    description: 'Build platform (windows/linux)'
+    required: true
+  install-artifact-name:
+    description: 'OCCT installation artifact name'
+    required: true
+  thirdparty_url:
+    description: 'URL to download 3rdparty dependencies'
+    required: false
+    default: 'https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_9_0_beta1/3rdparty-vc14-64.zip'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Download OCCT installation
+      uses: actions/download-artifact@v4.1.7
+      with:
+        name: ${{ inputs.install-artifact-name }}
+        path: occt-install
+
+    - name: Install Windows dependencies
+      if: inputs.platform == 'windows'
+      shell: pwsh
+      run: |
+          Invoke-WebRequest -Uri ${{ inputs.thirdparty_url }} -OutFile 3rdparty-vc14-64.zip
+          Expand-Archive -Path 3rdparty-vc14-64.zip -DestinationPath .
+          Remove-Item 3rdparty-vc14-64.zip
+
+    - name: Install Linux dependencies
+      if: inputs.platform == 'linux'
+      shell: bash
+      run: sudo apt-get update && sudo apt-get install -y tcl-dev tk-dev cmake gcc g++ make libbtbb-dev libx11-dev libglu1-mesa-dev tcllib tcl-thread tcl libvtk9-dev libopenvr-dev libdraco-dev libfreeimage-dev libegl1-mesa-dev libgles2-mesa-dev libfreetype-dev qtbase5-dev qt5-qmake qtbase5-dev-tools qtdeclarative5-dev qttools5-dev qttools5-dev-tools
+
+    - name: Setup MSBuild
+      if: inputs.platform == 'windows'
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Build Qt Samples - Windows
+      if: inputs.platform == 'windows'
+      shell: cmd
+      run: |
+        REM Setup environment
+        cd ${{ github.workspace }}/occt-install/
+        call env.bat vc14 win64 Release
+
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x64
+
+        REM Setup Qt environment
+        set "QTDIR=${{ github.workspace }}\3rdparty-vc14-64\qt5.11.2-vc14-64"
+        set "PATH=%QTDIR%\bin;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE;%PATH%"
+
+        cd ${{ github.workspace }}/samples/qt
+
+        for %%s in (IESample Tutorial FuncDemo) do (
+          cd %%s
+          echo "Generating project for %%s..."
+          qmake -tp vc -r -o %%s.sln %%s0.pro
+
+          echo "Restoring %%s..."
+          msbuild.exe %%s.sln -t:Restore -p:Configuration=Release -p:Platform=x64 /consoleloggerparameters:Verbosity=normal;Summary /flp:LogFile=%%s_restore.log;Verbosity=detailed
+          
+          echo "Building %%s..."
+          msbuild.exe %%s.sln /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v143 /consoleloggerparameters:Verbosity=normal;Summary /flp:LogFile=%%s_build.log;Verbosity=detailed /m
+          
+          REM Display logs if build fails
+          if errorlevel 1 (
+            echo "Build failed for %%s. Contents of restore log:"
+            type %%s_restore.log
+            echo "Contents of build log:"
+            type %%s_build.log
+            exit /b 1
+          )
+          
+          cd ..
+        )
+
+    - name: Build Qt Samples - Linux
+      if: inputs.platform == 'linux'
+      shell: bash
+      run: |
+        cd ${{ github.workspace }}/occt-install/bin
+        source env.sh
+        cd ${{ github.workspace }}/samples/qt
+        
+        for sample in IESample Tutorial FuncDemo; do
+          cd $sample
+          aQMakePath=`which qmake`
+          host=`uname -s`
+          export STATION=$host
+          export RES_DIR="${{ github.workspace }}/samples/qt/${sample}/result"
+          qmake $sample.pro
+          aNbJobs="$(getconf _NPROCESSORS_ONLN)"
+          make -j$aNbJobs release
+          cd ..
+        done
+
+    - name: Upload Qt Samples
+      uses: actions/upload-artifact@v4.4.3
+      with:
+        name: qt-samples-${{ inputs.platform }}-x64
+        path: |
+          samples/qt/
+          samples/qt/
+        retention-days: 7

.github/actions/build-tinspector/action.yml

@@ -0,0 +1,88 @@
+name: 'Build TInspector'
+description: 'Build TInspector using OCCT installation as a separate job'
+
+inputs:
+  platform:
+    description: 'Build platform (windows/linux)'
+    required: true
+  install-artifact-name:
+    description: 'OCCT installation artifact name'
+    required: true
+  thirdparty_url:
+    description: 'URL to download 3rdparty dependencies'
+    required: false
+    default: 'https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_9_0_beta1/3rdparty-vc14-64.zip'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Download OCCT installation
+      uses: actions/download-artifact@v4.1.7
+      with:
+        name: ${{ inputs.install-artifact-name }}
+        path: occt-install
+
+    - name: Install Windows dependencies
+      if: inputs.platform == 'windows'
+      shell: pwsh
+      run: |
+          Invoke-WebRequest -Uri ${{ inputs.thirdparty_url }} -OutFile 3rdparty-vc14-64.zip
+          Expand-Archive -Path 3rdparty-vc14-64.zip -DestinationPath .
+          Remove-Item 3rdparty-vc14-64.zip
+
+    - name: Install Linux dependencies
+      if: inputs.platform == 'linux'
+      shell: bash
+      run: sudo apt-get update && sudo apt-get install -y tcl-dev tk-dev cmake gcc g++ make libbtbb-dev libx11-dev libglu1-mesa-dev tcllib tcl-thread tcl libvtk9-dev libopenvr-dev libdraco-dev libfreeimage-dev libegl1-mesa-dev libgles2-mesa-dev libfreetype-dev qtbase5-dev qt5-qmake qtbase5-dev-tools qtdeclarative5-dev qttools5-dev qttools5-dev-tools
+
+    - name: Configure TInspector - Windows
+      if: inputs.platform == 'windows'
+      shell: pwsh
+      run: |
+        cd tools
+        mkdir build
+        cd build
+        cmake -G "Visual Studio 17 2022" -A x64 `
+              -D CMAKE_BUILD_TYPE=Release `
+              -D BUILD_SHARED_LIBS=ON `
+              -D 3RDPARTY_DIR=${{ github.workspace }}//3rdparty-vc14-64 `
+              -D OpenCASCADE_DIR=${{ github.workspace }}/occt-install `
+              -D INSTALL_DIR=${{ github.workspace }}/tools/install `
+              -D CMAKE_POLICY_VERSION_MINIMUM=3.5 `
+              ..
+
+    - name: Configure TInspector - Linux
+      if: inputs.platform == 'linux'
+      shell: bash
+      run: |
+        cd tools
+        mkdir build
+        cd build
+        cmake -G "Unix Makefiles" \
+              -D CMAKE_BUILD_TYPE=Release \
+              -D BUILD_SHARED_LIBS=ON \
+              -D OpenCASCADE_DIR=${{ github.workspace }}/occt-install \
+              -D INSTALL_DIR=${{ github.workspace }}/tools/install \
+              -D CMAKE_POLICY_VERSION_MINIMUM=3.5 \
+              ..
+
+    - name: Build TInspector - Windows
+      if: inputs.platform == 'windows'
+      shell: pwsh
+      run: |
+        cd tools/build
+        cmake --build . --config Release --target install
+
+    - name: Build TInspector - Linux
+      if: inputs.platform == 'linux'
+      shell: bash
+      run: |
+        cd tools/build
+        make install -j$(nproc)
+
+    - name: Upload TInspector installation
+      uses: actions/upload-artifact@v4.4.3
+      with:
+        name: inspector-${{ inputs.platform }}-x64
+        path: tools/install
+        retention-days: 7

.github/actions/clang-format-check/action.yml

@@ -0,0 +1,83 @@
+name: 'Clang-Format Code Check'
+description: 'Check code formatting of changed files using clang-format'
+inputs:
+  base-ref:
+    description: 'Base reference to compare changes against'
+    required: true
+    default: 'master'
+  file-pattern:
+    description: 'Pattern to match files for formatting check'
+    required: false
+    default: '^(src|tools)/.*\.(cpp|hxx|cxx|lxx|h|pxx|hpp)$'
+  clang-format-version:
+    description: 'Required clang-format version'
+    required: false
+    default: '18.1.8'
+
+outputs:
+  has-changes:
+    description: 'Whether any files needed formatting'
+    value: ${{ steps.git-check.outputs.has_changes }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Check clang-format version
+      shell: pwsh
+      run: |
+        $version = clang-format --version
+        Write-Output "Detected clang-format version: $version"
+        $version | Select-String "${{ inputs.clang-format-version }}" >$null
+        if ($LASTEXITCODE -ne 0) {
+          echo "::error::Wrong clang-format version. Expected ${{ inputs.clang-format-version }}"
+          Write-Output "Error: Version mismatch - expected ${{ inputs.clang-format-version }}"
+          exit 1
+        }
+
+    - name: Get changed files
+      id: changed-files
+      shell: pwsh
+      run: |
+        $changedFiles = git diff --name-only origin/${{ inputs.base-ref }} HEAD |
+          Where-Object { $_ -match '${{ inputs.file-pattern }}' }
+        $changedFiles | Set-Content "changed_files.txt"
+        if ($changedFiles.Count -gt 0) {
+          echo "has_files=true" >> $env:GITHUB_OUTPUT
+        }
+
+    - name: Check formatting
+      if: steps.changed-files.outputs.has_files == 'true'
+      shell: pwsh
+      run: |
+        $files = Get-Content "changed_files.txt"
+        $files | ForEach-Object -ThrottleLimit 8 -Parallel {
+          clang-format -i -style=file $_
+        }
+
+    - name: Check git status
+      id: git-check
+      if: steps.changed-files.outputs.has_files == 'true'
+      shell: pwsh
+      run: |
+        git diff > format.patch
+        if ((Get-Item format.patch).length -gt 0) {
+          echo "has_changes=true" >> $env:GITHUB_OUTPUT
+        }
+
+    - name: Upload patch
+      if: steps.git-check.outputs.has_changes == 'true'
+      uses: actions/upload-artifact@v4
+      with:
+        name: format-patch
+        path: format.patch
+
+    - name: Failing step for formatting issues
+      if: steps.git-check.outputs.has_changes == 'true'
+      shell: pwsh
+      run: |
+        echo "::error::Files need formatting. To fix: 1. Download format.patch 2. \"git apply format.patch\" 3. Commit and push"
+        exit 1
+
+branding:
+  icon: 'check-square'
+  color: 'green'

.github/actions/scripts/cleanup_test_images.py

@@ -0,0 +1,90 @@
+import os
+import re
+from bs4 import BeautifulSoup
+from pathlib import Path
+import glob
+
+import os.path
+
+def get_referenced_images(html_file):
+    # Get the directory containing the HTML file
+    html_dir = os.path.dirname(os.path.abspath(html_file))
+    
+    with open(html_file, 'r', encoding='utf-8') as f:
+        soup = BeautifulSoup(f.read(), 'html.parser')
+    
+    images = set()
+    
+    # Extract direct image references
+    for img in soup.find_all('img'):
+        if src := img.get('src'):
+            # Convert relative path to absolute
+            abs_path = os.path.normpath(os.path.join(html_dir, src))
+            images.add(abs_path)
+    
+    # Extract toggle references
+    for elem in soup.find_all(attrs={'onclick': True}):
+        onclick = elem['onclick']
+        paths = re.findall(r'diffimage_toggle\(this,"([^"]+)","([^"]+)"\)', onclick)
+        for src1, src2 in paths:
+            # Convert relative paths to absolute
+            abs_path1 = os.path.normpath(os.path.join(html_dir, src1))
+            abs_path2 = os.path.normpath(os.path.join(html_dir, src2))
+            images.add(abs_path1)
+            images.add(abs_path2)
+    
+    return images
+
+def cleanup_platform_images(results_dir, platform):
+    html_file = f"{results_dir}/current/{platform}/diff-*.html"
+    html_files = glob.glob(html_file)
+    
+    if not html_files:
+        print(f"No diff HTML found for {platform}")
+        return
+        
+    # Get referenced images from HTML
+    referenced = set()
+    for html in html_files:
+        images = get_referenced_images(html)
+        referenced.update(images)
+    
+    # Convert relative paths to absolute
+    base_dir = Path(results_dir)
+    current_dir = base_dir / "current" / platform
+    master_dir = base_dir / "master" / platform
+    
+    # Find all PNGs
+    png_files = set()
+    for directory in [current_dir, master_dir]:
+        for root, _, files in os.walk(directory):
+            for file in files:
+                if file.lower().endswith('.png'):
+                    png_files.add(Path(root) / file)
+
+    # Remove unreferenced PNGs
+    for png in png_files:
+        if str(png) not in referenced:
+            try:
+                png.unlink()
+            except OSError as e:
+                print(f"Error removing {png}: {e}")
+
+def main():
+    platforms = [
+        "windows-x64",
+        "windows-clang-x64", 
+        "macos-x64",
+        "macos-gcc-x64",
+        "linux-clang-x64",
+        "linux-gcc-x64"
+    ]
+    
+    results_dir = Path("./").resolve()
+    
+    for platform in platforms:
+        print(f"\nProcessing {platform}...")
+        cleanup_platform_images(results_dir, platform)
+
+if __name__ == "__main__":
+    main()

.github/actions/setup-xvfb-mesa/action.yml

@@ -0,0 +1,18 @@
+name: 'Setup Xvfb and Mesa'
+description: 'Installs and configures Xvfb and Mesa for graphical testing on Linux'
+
+runs:
+  using: composite
+  steps:
+    - name: Install Xvfb and Mesa
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y xvfb mesa-utils libgl1-mesa-dri
+      shell: bash
+
+    - name: Start Xvfb
+      run: |
+        Xvfb :99 -screen 0 1920x1080x24 &
+        echo "DISPLAY=:99" >> $GITHUB_ENV
+        echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
+      shell: bash

.github/actions/testgrid/testlinuxclang.tcl

@@ -0,0 +1,32 @@
+set exclude_list [list \
+    "bugs caf bug31075" \
+    "bugs caf bug31546" \
+    "bugs fclasses bug6143" \
+    "bugs fclasses bug25574" \
+    "bugs fclasses bug29064" \
+    "bugs fclasses bug7287_3" \
+    "bugs fclasses bug7287_5" \
+    "bugs moddata_2 bug712_2" \
+    "bugs moddata_1 bug20627" \
+    "collections n arrayMove" \
+    "lowalgos intss bug565" \
+    "lowalgos intss bug567_1" \
+    "lowalgos intss bug23972" \
+    "lowalgos intss bug29910_2" \
+    "opengl background bug27836" \
+    "opengl text C4" \
+    "opengles3 background bug27836" \
+    "opengles3 general msaa" \
+    "opengles3 geom interior1" \
+    "opengles3 geom interior2" \
+    "opengles3 raytrace msaa" \
+    "opengles3 text C4" \
+    "opengles3 textures alpha_mask" \
+    "boolean bopfuse_simple ZP6" \
+    "boolean gdml_private B5" \
+    "bugs modalg_1 bug19071" \
+    "bugs modalg_5 bug25199"
+]
+
+set exclude_str [join $exclude_list ,]
+testgrid -exclude {*}$exclude_str -outdir results/linux-clang-x64

.github/actions/testgrid/testlinuxgcc.tcl

@@ -0,0 +1,28 @@
+set exclude_list [list \
+    "bugs caf bug31075" \
+    "bugs caf bug31546" \
+    "bugs fclasses bug6143" \
+    "bugs moddata_2 bug712_2" \
+    "bugs moddata_1 bug20627" \
+    "bugs modalg_6 bug27884" \
+    "lowalgos intss bug565" \
+    "lowalgos intss bug567_1" \
+    "lowalgos intss bug23972" \
+    "lowalgos intss bug29910_2" \
+    "opengl background bug27836" \
+    "opengl text C4" \
+    "opengles3 background bug27836" \
+    "opengles3 general msaa" \
+    "opengles3 geom interior1" \
+    "opengles3 geom interior2" \
+    "opengles3 raytrace msaa" \
+    "opengles3 text C4" \
+    "opengles3 textures alpha_mask" \
+    "boolean bopfuse_simple ZP6" \
+    "boolean gdml_private B5" \
+    "bugs modalg_1 bug19071" \
+    "bugs modalg_5 bug25199"
+]
+
+set exclude_str [join $exclude_list ,]
+testgrid -exclude {*}$exclude_str -outdir results/linux-gcc-x64

.github/actions/testgrid/testmacos.tcl

@@ -0,0 +1 @@
+testgrid -outdir results/macos-x64 caf basic

.github/actions/testgrid/testmacosgcc.tcl

@@ -0,0 +1 @@
+testgrid -outdir results/macos-gcc-x64 caf basic

.github/actions/testgrid/testwindows.tcl

@@ -0,0 +1,24 @@
+set exclude_list [list \
+    "bugs fclasses bug6143" \
+    "bugs modalg_5 bug24639" \
+    "bugs modalg_7 bug83" \
+    "bugs caf bug31918_1" \
+    "chamfer dist_angle_sequence A5" \
+    "opengl background bug27836" \
+    "opengl drivers d3dhost" \
+    "opengl background srgb" \
+    "opengl text C4" \
+    "opengles2 text C4" \
+    "opengles3 text C4" \
+    "boolean gdml_private B5" \
+    "chamfer dist_angle A3" \
+    "chamfer dist_angle E5" \
+    "chamfer dist_angle_complex A1" \
+    "chamfer dist_angle_complex A4" \
+    "chamfer dist_angle_complex A5" \
+    "chamfer dist_angle_sequence A1" \
+    "chamfer dist_angle_sequence A4"
+]
+
+set exclude_str [join $exclude_list ,]
+testgrid -exclude {*}$exclude_str -outdir results/windows-x64

.github/actions/testgrid/testwindowsclang.tcl

@@ -0,0 +1,25 @@
+set exclude_list [list \
+    "bugs caf bug31918_1" \
+    "bugs fclasses bug6143" \
+    "bugs fclasses bug25574" \
+    "bugs fclasses bug29064" \
+    "chamfer dist_angle_sequence A5" \
+    "collections n arrayMove" \
+    "opengl background bug27836" \
+    "opengl drivers d3dhost" \
+    "opengl background srgb" \
+    "opengl text C4" \
+    "opengles2 text C4" \
+    "opengles3 text C4" \
+    "boolean gdml_private B5" \
+    "chamfer dist_angle A3" \
+    "chamfer dist_angle E5" \
+    "chamfer dist_angle_complex A1" \
+    "chamfer dist_angle_complex A4" \
+    "chamfer dist_angle_complex A5" \
+    "chamfer dist_angle_sequence A1" \
+    "chamfer dist_angle_sequence A4"
+]
+
+set exclude_str [join $exclude_list ,]
+testgrid -exclude {*}$exclude_str -outdir results/windows-clang-x64

.github/workflows/build-docs.yml

@@ -1,45 +0,0 @@
-# This workflow builds the OCCT reference manual documentation.
-# It is triggered on pushes to the 'master' branch.
-# The workflow includes steps to checkout the repository, install dependencies, build the documentation, and upload the generated documentation and logs as artifacts.
-
-name: Build Documentation
-
-on:
-  push:
-    branches:
-      - 'master'
-
-jobs:
-  build:
-    name: Build Refman Documentation
-    runs-on: ubuntu-24.04
-
-    steps:
-    # Step: Checkout the repository
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.1
-
-    # Step: Install necessary dependencies for building the documentation
-    - name: Install dependencies
-      run: sudo apt-get update && sudo apt-get install -y tcl-dev tk-dev cmake gcc g++ make libbtbb-dev libx11-dev libglu1-mesa-dev doxygen graphviz
-
-    # Step: Build the reference manual documentation
-    - name: Build documentation
-      run: bash gendoc -refman
-
-    # Step: Upload the generated reference manual documentation as an artifact
-    - name: Upload refman documentation
-      uses: actions/upload-artifact@v4.4.3
-      id: artifact-upload-step
-      with:
-        name: refman-doc
-        path: doc/refman
-        retention-days: 90
-
-    # Step: Upload the documentation generation log as an artifact
-    - name: Upload generation log
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: doxygen.log
-        path: doc/html_doxygen_err.log
-        retention-days: 90

.github/workflows/build-multiconfig-mingw.yml

@@ -0,0 +1,219 @@
+# This workflow validates the build on Windows using MinGW and MSYS2.
+# It is triggered on pushes to the master branch.
+# The workflow includes steps to install dependencies, configure, build, and clean up the project.
+
+name: MinGW build validation
+
+on:
+  push:
+    branches:
+      - 'master'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  main_job:
+    name: Windows MinGW validation
+    runs-on: windows-2022
+
+    strategy:
+      matrix:
+        config:
+          - {
+              name: "GCC",
+              cc: "x86_64-w64-mingw32-gcc",
+              cxx: "x86_64-w64-mingw32-g++",
+              package: "mingw-w64-x86_64-toolchain",
+              thirdparty_dir: "/mingw64",
+              compiler_flags: "",
+              dependencies: "mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-rapidjson mingw-w64-x86_64-freetype mingw-w64-x86_64-draco mingw-w64-x86_64-freeimage mingw-w64-x86_64-tbb mingw-w64-x86_64-tk mingw-w64-x86_64-tcl mingw-w64-x86_64-openvr mingw-w64-x86_64-jemalloc mingw-w64-x86_64-mesa mingw-w64-x86_64-angleproject mingw-w64-x86_64-llvm-openmp mingw-w64-x86_64-winpthreads-git mingw-w64-x86_64-libwinpthread-git mingw-w64-cross-mingwarm64-winpthreads"
+            }
+          - {
+              name: "Clang",
+              cc: "clang",
+              cxx: "clang++",
+              package: "mingw-w64-clang-x86_64-toolchain",
+              thirdparty_dir: "/clang64",
+              compiler_flags: "-D CMAKE_CXX_FLAGS=\"-Wall -Wextra\" -D CMAKE_C_FLAGS=\"-Wall -Wextra\"",
+              dependencies: "mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-ninja mingw-w64-clang-x86_64-rapidjson mingw-w64-clang-x86_64-freetype mingw-w64-clang-x86_64-draco mingw-w64-clang-x86_64-freeimage mingw-w64-clang-x86_64-tbb mingw-w64-clang-x86_64-tk mingw-w64-clang-x86_64-tcl mingw-w64-clang-x86_64-openvr mingw-w64-clang-x86_64-jemalloc mingw-w64-clang-x86_64-mesa mingw-w64-clang-x86_64-angleproject mingw-w64-clang-x86_64-llvm-openmp mingw-w64-clang-x86_64-winpthreads-git mingw-w64-clang-x86_64-libwinpthread-git mingw-w64-cross-mingwarm64-winpthreads"
+            }
+          - {
+              name: "UCRT",
+              cc: "x86_64-w64-mingw32-gcc",
+              cxx: "x86_64-w64-mingw32-g++",
+              package: "mingw-w64-ucrt-x86_64-toolchain",
+              thirdparty_dir: "/ucrt64",
+              compiler_flags: "",
+              dependencies: "mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-gcc-libs mingw-w64-ucrt-x86_64-omp mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-ninja mingw-w64-ucrt-x86_64-rapidjson mingw-w64-ucrt-x86_64-freetype mingw-w64-ucrt-x86_64-draco mingw-w64-ucrt-x86_64-freeimage mingw-w64-ucrt-x86_64-tbb mingw-w64-ucrt-x86_64-tk mingw-w64-ucrt-x86_64-tcl mingw-w64-ucrt-x86_64-openvr mingw-w64-ucrt-x86_64-jemalloc mingw-w64-ucrt-x86_64-mesa mingw-w64-ucrt-x86_64-angleproject mingw-w64-ucrt-x86_64-llvm-openmp mingw-w64-ucrt-x86_64-winpthreads-git mingw-w64-ucrt-x86_64-libwinpthread-git mingw-w64-cross-mingwarm64-winpthreads"
+            }
+        build_type: [Debug, Release]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.7
+
+    - name: Set up MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.config.name == 'Clang' && 'CLANG64' || matrix.config.name == 'UCRT' && 'UCRT64' || 'MINGW64' }}
+        update: true
+        install: ${{ matrix.config.package }} ${{ matrix.config.dependencies }}
+
+    - name: Setup environment
+      shell: msys2 {0}
+      run: |
+        echo "Checking compiler version:"
+        ${{ matrix.config.cc }} --version
+        echo "Checking CMake version:"
+        cmake --version
+        echo "Setting up environment variables..."
+        echo "$MSYSTEM_PREFIX/bin" >> $GITHUB_PATH
+        echo "CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX" >> $GITHUB_ENV
+
+    - name: Configure basic
+      shell: msys2 {0}
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Ninja" \
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+              -D CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX \
+              -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              ${{ matrix.config.compiler_flags }} ..
+
+    - name: Build basic
+      shell: msys2 {0}
+      run: |
+        cd build
+        cmake --build . --config ${{ matrix.build_type }} -- -j 4
+
+    - name: Clear up after build
+      shell: pwsh
+      run: |
+        Remove-Item -Recurse -Force build
+
+    - name: Configure full shared
+      shell: msys2 {0}
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Ninja" \
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+              -D CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX \
+              -D BUILD_USE_PCH=OFF \
+              -D BUILD_INCLUDE_SYMLINK=ON \
+              -D BUILD_OPT_PROFILE=Production \
+              -D BUILD_LIBRARY_TYPE=Shared \
+              -D USE_TK=ON \
+              -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              -D USE_MMGR_TYPE=JEMALLOC \
+              -D INSTALL_DIR="${{ github.workspace }}/install-${{ matrix.build_type }}" \
+              -D USE_FREETYPE=ON \
+              -D USE_DRACO=ON \
+              -D USE_FFMPEG=OFF \
+              -D USE_FREEIMAGE=ON \
+              -D USE_GLES2=ON \
+              -D USE_OPENVR=ON \
+              -D USE_VTK=OFF \
+              -D USE_TBB=OFF \
+              -D USE_RAPIDJSON=ON \
+              -D USE_OPENGL=ON \
+              ${{ matrix.config.compiler_flags }} ..
+
+    - name: Build full shared
+      shell: msys2 {0}
+      run: |
+        cd build
+        cmake --build . --target install --config ${{ matrix.build_type }} -- -j 4
+    
+    - name: Clear up after build
+      shell: pwsh
+      run: |
+        Remove-Item -Recurse -Force build
+        Remove-Item -Recurse -Force ${{ github.workspace }}/install-${{ matrix.build_type }}
+
+    - name: Configure full static
+      shell: msys2 {0}
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Ninja" \
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+              -D CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX \
+              -D BUILD_USE_PCH=OFF \
+              -D BUILD_INCLUDE_SYMLINK=ON \
+              -D BUILD_OPT_PROFILE=Default \
+              -D BUILD_LIBRARY_TYPE=Static \
+              -D USE_TK=ON \
+              -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              -D USE_MMGR_TYPE=JEMALLOC \
+              -D INSTALL_DIR="${{ github.workspace }}/install-${{ matrix.build_type }}" \
+              -D USE_FREETYPE=ON \
+              -D USE_DRACO=ON \
+              -D USE_FFMPEG=OFF \
+              -D USE_FREEIMAGE=ON \
+              -D USE_GLES2=ON \
+              -D USE_OPENVR=ON \
+              -D USE_VTK=OFF \
+              -D USE_TBB=OFF \
+              -D USE_RAPIDJSON=ON \
+              -D USE_OPENGL=ON \
+              ${{ matrix.config.compiler_flags }} ..
+
+    - name: Build full static
+      shell: msys2 {0}
+      run: |
+        cd build
+        cmake --build . --target install --config ${{ matrix.build_type }} -- -j 4
+
+    - name: Clear up after build
+      shell: pwsh
+      run: |
+        Remove-Item -Recurse -Force build
+        Remove-Item -Recurse -Force ${{ github.workspace }}/install-${{ matrix.build_type }}
+
+    - name: Configure full with DEBUG define
+      shell: msys2 {0}
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Ninja" \
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+              -D CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX \
+              -D BUILD_WITH_DEBUG=ON \
+              -D BUILD_USE_PCH=OFF \
+              -D BUILD_INCLUDE_SYMLINK=ON \
+              -D BUILD_OPT_PROFILE=Production \
+              -D BUILD_LIBRARY_TYPE=Shared \
+              -D USE_TK=ON \
+              -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              -D INSTALL_DIR="${{ github.workspace }}/install-${{ matrix.build_type }}" \
+              -D USE_FREETYPE=ON \
+              -D USE_DRACO=ON \
+              -D USE_FFMPEG=OFF \
+              -D USE_FREEIMAGE=ON \
+              -D USE_GLES2=ON \
+              -D USE_OPENVR=ON \
+              -D USE_VTK=OFF \
+              -D USE_TBB=OFF \
+              -D USE_RAPIDJSON=ON \
+              -D USE_OPENGL=ON \
+              ${{ matrix.config.compiler_flags }} ..
+
+    - name: Build full with DEBUG define
+      shell: msys2 {0}
+      run: |
+        cd build
+        cmake --build . --target install --config ${{ matrix.build_type }} -- -j 4
+      
+    - name: Clear up after build
+      shell: pwsh
+      run: |
+        Remove-Item -Recurse -Force build
+        Remove-Item -Recurse -Force ${{ github.workspace }}/install-${{ matrix.build_type }}

.github/workflows/build-multiconfig-msvc.yml

@@ -0,0 +1,213 @@
+# This workflow validates the build on Windows using MSVC and Clang compilers.
+# It is triggered on pushes to the master branch.
+# The workflow includes steps to install dependencies, configure, build, and clean up the project for different configurations.
+
+name: MSVC build validation
+
+on:
+  push:
+    branches:
+      - 'master'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  main_job:
+    name: Windows MSVC/Clang validation
+    runs-on: windows-2022
+
+    strategy:
+      matrix:
+        config:
+          - {
+              name: "MSVC",
+              cc: "cl",
+              cxx: "cl",
+              generator: "Visual Studio 17 2022",
+              toolset: "host=x64",
+              c_flags: "/W4 /WX",
+              cxx_flags: "/W4 /WX"
+            }
+          - {
+              name: "Clang",
+              cc: "clang",
+              cxx: "clang++",
+              generator: "Ninja",
+              toolset: "",
+              c_flags: "-Werror -Wall -Wextra -Wno-unknown-warning-option",
+              cxx_flags: "-Werror -Wall -Wextra -Wno-unknown-warning-option"
+            }
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.7
+
+    - name: Set up MSVC
+      uses: ilammy/msvc-dev-cmd@v1.13.0
+      with:
+        arch: x64
+
+    - name: Download and extract 3rdparty dependencies
+      run: |
+          Invoke-WebRequest -Uri https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_9_0_beta1/3rdparty-vc14-64.zip -OutFile 3rdparty-vc14-64.zip
+          Expand-Archive -Path 3rdparty-vc14-64.zip -DestinationPath .
+          Remove-Item 3rdparty-vc14-64.zip
+      shell: pwsh
+
+    - name: Download and extract Mesa3D
+      run: |
+        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.3.2/mesa3d-24.3.2-release-mingw.7z
+        7z x mesa3d.7z -omesa3d
+
+    - name: Run system-wide deployment
+      run: |
+        cd mesa3d
+        .\systemwidedeploy.cmd 1
+        .\systemwidedeploy.cmd 5
+      shell: cmd
+
+    - name: Configure basic
+      run: |
+        mkdir build
+        cd build
+        cmake -G "${{ matrix.config.generator }}" ${{ matrix.config.toolset }} `
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} `
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} `
+              -D 3RDPARTY_DIR=${{ github.workspace }}/3rdparty-vc14-64 `
+              -D CMAKE_CXX_FLAGS="${{ matrix.config.cxx_flags }}" `
+              -D CMAKE_C_FLAGS="${{ matrix.config.c_flags }}" ..
+      shell: pwsh
+
+    - name: Build basic
+      run: |
+        cd build
+        cmake --build . --config Release
+      shell: pwsh
+
+    - name: Clear up after build
+      run: |
+        Remove-Item -Recurse -Force build
+      shell: pwsh
+
+    - name: Configure full shared
+      run: |
+        mkdir build
+        cd build
+        cmake -G "${{ matrix.config.generator }}" ${{ matrix.config.toolset }} `
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} `
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} `
+              -D BUILD_USE_PCH=OFF `
+              -D BUILD_INCLUDE_SYMLINK=ON `
+              -D BUILD_OPT_PROFILE=Production `
+              -D BUILD_LIBRARY_TYPE=Shared `
+              -D CMAKE_BUILD_TYPE=Debug `
+              -D INSTALL_DIR=${{ github.workspace }}/install `
+              -D 3RDPARTY_DIR=${{ github.workspace }}/3rdparty-vc14-64 `
+              -D USE_MMGR_TYPE=JEMALLOC `
+              -D USE_FREETYPE=ON `
+              -D USE_DRACO=ON `
+              -D USE_FFMPEG=ON `
+              -D USE_FREEIMAGE=ON `
+              -D USE_GLES2=ON `
+              -D USE_OPENVR=ON `
+              -D USE_VTK=${{ matrix.config.name == 'MSVC' && 'ON' || 'OFF' }} `
+              -D USE_TBB=ON `
+              -D USE_RAPIDJSON=ON `
+              -D USE_OPENGL=ON `
+              -D CMAKE_CXX_FLAGS="${{ matrix.config.cxx_flags }}" `
+              -D CMAKE_C_FLAGS="${{ matrix.config.c_flags }}" ..
+      shell: pwsh
+
+    - name: Build full shared
+      run: |
+        cd build
+        cmake --build . --target install --config Debug
+      shell: pwsh
+
+    - name: Clear up after build
+      run: |
+        Remove-Item -Recurse -Force build
+        Remove-Item -Recurse -Force ${{ github.workspace }}/install
+      shell: pwsh
+
+    - name: Configure full static
+      run: |
+        mkdir build
+        cd build
+        cmake -G "${{ matrix.config.generator }}" ${{ matrix.config.toolset }} `
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} `
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} `
+              -D BUILD_USE_PCH=OFF `
+              -D BUILD_INCLUDE_SYMLINK=ON `
+              -D BUILD_OPT_PROFILE=Default `
+              -D BUILD_LIBRARY_TYPE=Static `
+              -D CMAKE_BUILD_TYPE=Debug `
+              -D INSTALL_DIR=${{ github.workspace }}/install `
+              -D 3RDPARTY_DIR=${{ github.workspace }}/3rdparty-vc14-64 `
+              -D USE_MMGR_TYPE=JEMALLOC `
+              -D USE_FREETYPE=ON `
+              -D USE_DRACO=ON `
+              -D USE_FFMPEG=ON `
+              -D USE_FREEIMAGE=ON `
+              -D USE_GLES2=ON `
+              -D USE_OPENVR=ON `
+              -D USE_VTK=OFF `
+              -D USE_TBB=ON `
+              -D USE_RAPIDJSON=ON `
+              -D USE_OPENGL=ON `
+              -D CMAKE_CXX_FLAGS="${{ matrix.config.cxx_flags }}" `
+              -D CMAKE_C_FLAGS="${{ matrix.config.c_flags }}" ..
+      shell: pwsh
+
+    - name: Build full static
+      run: |
+        cd build
+        cmake --build . --target install --config Debug
+      shell: pwsh
+
+    - name: Clear up after build
+      run: |
+        Remove-Item -Recurse -Force build
+        Remove-Item -Recurse -Force ${{ github.workspace }}/install
+      shell: pwsh
+
+    - name: Configure full with DEBUG define
+      run: |
+        mkdir build
+        cd build
+        cmake -G "${{ matrix.config.generator }}" ${{ matrix.config.toolset }} `
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} `
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} `
+              -D BUILD_WITH_DEBUG=ON `
+              -D BUILD_USE_PCH=OFF `
+              -D BUILD_INCLUDE_SYMLINK=ON `
+              -D BUILD_OPT_PROFILE=Production `
+              -D BUILD_LIBRARY_TYPE=Shared `
+              -D CMAKE_BUILD_TYPE=Debug `
+              -D INSTALL_DIR=${{ github.workspace }}/install `
+              -D 3RDPARTY_DIR=${{ github.workspace }}/3rdparty-vc14-64 `
+              -D USE_FREETYPE=ON `
+              -D USE_DRACO=ON `
+              -D USE_FFMPEG=ON `
+              -D USE_FREEIMAGE=ON `
+              -D USE_GLES2=ON `
+              -D USE_OPENVR=ON `
+              -D USE_VTK=${{ matrix.config.name == 'MSVC' && 'ON' || 'OFF' }} `
+              -D USE_TBB=ON `
+              -D USE_RAPIDJSON=ON `
+              -D USE_OPENGL=ON ` ..
+      shell: pwsh
+
+    - name: Build full with DEBUG define
+      run: |
+        cd build
+        cmake --build . --target install --config Debug
+      shell: pwsh
+
+    - name: Clear up after build
+      run: |
+        Remove-Item -Recurse -Force build
+        Remove-Item -Recurse -Force ${{ github.workspace }}/install
+      shell: pwsh

.github/workflows/build-multiconfig-ubuntu.yml

@@ -0,0 +1,180 @@
+# This workflow validates the build on the latest Ubuntu version (24.04) using multiple configurations.
+# It is triggered on pushes to the master branch.
+# The workflow includes steps to install dependencies, configure, build, and clean up the project for different configurations.
+
+name: Ubuntu build validation
+
+on:
+  push:
+    branches:
+      - 'master'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  main_job:
+    name: Latest ubuntu validation
+    runs-on: ubuntu-24.04
+
+    strategy:
+      matrix:
+        config:
+          - {
+              name: "GCC",
+              cc: "gcc",
+              cxx: "g++",
+              compiler_flags: ""
+            }
+          - {
+              name: "Clang",
+              cc: "clang",
+              cxx: "clang++",
+              compiler_flags: "-D CMAKE_CXX_FLAGS=\"-Werror -Wall -Wextra\" -D CMAKE_C_FLAGS=\"-Werror -Wall -Wextra\""
+            }
+        build_type: [Debug, Release]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.7
+
+    - name: Install dependencies
+      run: sudo apt-get update && sudo apt-get install -y ninja-build tcl-dev tk-dev cmake clang gcc g++ make libbtbb-dev libx11-dev libglu1-mesa-dev tcllib tcl-thread tcl libvtk9-dev libopenvr-dev libdraco-dev libfreeimage-dev libegl1-mesa-dev libgles2-mesa-dev libfreetype-dev libjemalloc-dev
+
+    - name: Install rapidjson
+      run: |
+        wget https://github.com/Tencent/rapidjson/archive/858451e5b7d1c56cf8f6d58f88cf958351837e53.zip -O rapidjson.zip
+        unzip rapidjson.zip
+
+    - name: Configure basic
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Ninja" \
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+              -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              ${{ matrix.config.compiler_flags }} ..
+
+    - name: Build basic
+      run: |
+        cd build
+        cmake --build . --config ${{ matrix.build_type }} -- -j 4
+
+    - name: Clear up after build
+      run: |
+        rm -rf build
+
+    - name: Configure full shared
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Ninja" \
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+              -D BUILD_USE_PCH=OFF \
+              -D BUILD_INCLUDE_SYMLINK=ON \
+              -D BUILD_OPT_PROFILE=Production \
+              -D BUILD_LIBRARY_TYPE=Shared \
+              -D USE_TK=ON \
+              -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              -D USE_MMGR_TYPE=JEMALLOC \
+              -D INSTALL_DIR=${{ github.workspace }}/install-${{ matrix.build_type }} \
+              -D 3RDPARTY_RAPIDJSON_DIR=${{ github.workspace }}/rapidjson-858451e5b7d1c56cf8f6d58f88cf958351837e53 \
+              -D USE_FREETYPE=ON \
+              -D USE_DRACO=ON \
+              -D USE_FFMPEG=OFF \
+              -D USE_FREEIMAGE=ON \
+              -D USE_GLES2=ON \
+              -D USE_OPENVR=ON \
+              -D USE_VTK=ON \
+              -D USE_TBB=ON \
+              -D USE_RAPIDJSON=ON \
+              -D USE_OPENGL=ON \
+              ${{ matrix.config.compiler_flags }} ..
+
+    - name: Build full shared
+      run: |
+        cd build
+        cmake --build . --target install --config ${{ matrix.build_type }} -- -j 4
+    
+    - name: Clear up after build
+      run: |
+        rm -rf build
+        rm -rf ${{ github.workspace }}/install-${{ matrix.build_type }}
+
+    - name: Configure full static
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Ninja" \
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+              -D BUILD_USE_PCH=OFF \
+              -D BUILD_INCLUDE_SYMLINK=ON \
+              -D BUILD_OPT_PROFILE=Default \
+              -D BUILD_LIBRARY_TYPE=Static \
+              -D USE_TK=ON \
+              -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              -D USE_MMGR_TYPE=JEMALLOC \
+              -D INSTALL_DIR=${{ github.workspace }}/install-${{ matrix.build_type }} \
+              -D 3RDPARTY_RAPIDJSON_DIR=${{ github.workspace }}/rapidjson-858451e5b7d1c56cf8f6d58f88cf958351837e53 \
+              -D USE_FREETYPE=ON \
+              -D USE_DRACO=ON \
+              -D USE_FFMPEG=OFF \
+              -D USE_FREEIMAGE=ON \
+              -D USE_GLES2=ON \
+              -D USE_OPENVR=ON \
+              -D USE_VTK=OFF \
+              -D USE_TBB=ON \
+              -D USE_RAPIDJSON=ON \
+              -D USE_OPENGL=ON \
+              ${{ matrix.config.compiler_flags }} ..
+
+    - name: Build full static
+      run: |
+        cd build
+        cmake --build . --target install --config ${{ matrix.build_type }} -- -j 4
+
+    - name: Clear up after build
+      run: |
+        rm -rf build
+        rm -rf ${{ github.workspace }}/install-${{ matrix.build_type }}
+
+    - name: Configure full with DEBUG define
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Ninja" \
+              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+              -D BUILD_WITH_DEBUG=ON \
+              -D BUILD_USE_PCH=OFF \
+              -D BUILD_INCLUDE_SYMLINK=ON \
+              -D BUILD_OPT_PROFILE=Production \
+              -D BUILD_LIBRARY_TYPE=Shared \
+              -D USE_TK=ON \
+              -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              -D INSTALL_DIR=${{ github.workspace }}/install-${{ matrix.build_type }} \
+              -D 3RDPARTY_RAPIDJSON_DIR=${{ github.workspace }}/rapidjson-858451e5b7d1c56cf8f6d58f88cf958351837e53 \
+              -D USE_FREETYPE=ON \
+              -D USE_DRACO=ON \
+              -D USE_FFMPEG=OFF \
+              -D USE_FREEIMAGE=ON \
+              -D USE_GLES2=ON \
+              -D USE_OPENVR=ON \
+              -D USE_VTK=ON \
+              -D USE_TBB=ON \
+              -D USE_RAPIDJSON=ON \
+              -D USE_OPENGL=ON ..
+
+    - name: Build full with DEBUG define
+      run: |
+        cd build
+        cmake --build . --target install --config ${{ matrix.build_type }} -- -j 4
+      
+    - name: Clear up after build
+      run: |
+        rm -rf build
+        rm -rf ${{ github.workspace }}/install-${{ matrix.build_type }}

.github/workflows/build-occt-wasm-ubuntu.yml

@@ -0,0 +1,102 @@
+# This workflow validates the WebAssembly build on Ubuntu.
+# It is triggered on pushes to the master branch.
+# The workflow includes steps to install dependencies, configure, build, and clean up the project.
+
+name: WebAssembly build (Ubuntu)
+
+on:
+  push:
+    branches:
+      - 'master'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+env:
+  USERNAME: Open-Cascade-SAS
+  VCPKG_EXE: ${{ github.workspace }}/vcpkg/vcpkg
+  FEED_URL: https://nuget.pkg.github.com/Open-Cascade-SAS/index.json
+  VCPKG_BINARY_SOURCES: "clear;nuget,https://nuget.pkg.github.com/Open-Cascade-SAS/index.json,readwrite"
+  EMSDK_VERSION: 3.1.74
+
+jobs:
+  wasm-build:
+    name: WebAssembly Build
+    runs-on: ubuntu-24.04
+
+    strategy:
+      matrix:
+        build_type: [Debug, Release]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.7
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y build-essential ninja-build curl zip unzip tar nasm autoconf mono-complete
+        sudo apt-get install -y libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev
+
+    - name: Setup vcpkg
+      run: |
+        git clone https://github.com/microsoft/vcpkg.git
+        ./vcpkg/bootstrap-vcpkg.sh
+
+    - name: Add NuGet sources
+      run: |
+        mono $(${VCPKG_EXE} fetch nuget | tail -n 1) \
+          sources add \
+          -Source "${FEED_URL}" \
+          -StorePasswordInClearText \
+          -Name GitHubPackages \
+          -UserName "${USERNAME}" \
+          -Password "${{ secrets.GITHUB_TOKEN }}"
+        mono $(${VCPKG_EXE} fetch nuget | tail -n 1) \
+          setapikey "${{ secrets.GITHUB_TOKEN }}" \
+          -Source "${FEED_URL}"
+
+    - name: Setup Emscripten
+      run: |
+        git clone https://github.com/emscripten-core/emsdk.git
+        cd emsdk
+        ./emsdk install ${EMSDK_VERSION}
+        ./emsdk activate ${EMSDK_VERSION}
+        echo "EMSDK=${{ github.workspace }}/emsdk" >> $GITHUB_ENV
+        echo "${{ github.workspace }}/emsdk" >> $GITHUB_PATH
+        echo "${{ github.workspace }}/emsdk/upstream/emscripten" >> $GITHUB_PATH
+
+    - name: Configure OCCT with vcpkg
+      run: |
+        source "${{ github.workspace }}/emsdk/emsdk_env.sh"
+        mkdir -p "build-${{ matrix.build_type }}"
+        cd "build-${{ matrix.build_type }}"
+        export VCPKG_ROOT="${{ github.workspace }}/vcpkg"
+        emcmake cmake -G "Ninja" \
+          -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" \
+          -DVCPKG_TARGET_TRIPLET=wasm32-emscripten \
+          -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE="$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake" \
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          -DBUILD_USE_VCPKG=ON \
+          -DUSE_MMGR_TYPE=NATIVE \
+          -DBUILD_LIBRARY_TYPE=Static \
+          -DBUILD_MODULE_Draw=OFF \
+          -DUSE_FREETYPE=OFF \
+          -DUSE_TK=OFF \
+          -DUSE_TCL=OFF \
+          -DUSE_DRACO=ON \
+          -DUSE_FFMPEG=OFF \
+          -DUSE_FREEIMAGE=OFF \
+          -DUSE_OPENVR=OFF \
+          -DUSE_VTK=OFF \
+          -DUSE_TBB=OFF \
+          -DUSE_RAPIDJSON=ON \
+          -DINSTALL_DIR="${{ github.workspace }}/install-wasm-${{ matrix.build_type }}" \
+          -DCMAKE_CXX_FLAGS="-s WASM=1 -s EXPORTED_RUNTIME_METHODS=['ccall','cwrap'] -s ALLOW_MEMORY_GROWTH=1" \
+          -DCMAKE_EXECUTABLE_SUFFIX=".js" ..
+
+    - name: Build
+      run: |
+        cd build-${{ matrix.build_type }}
+        cmake --build . --config ${{ matrix.build_type }} --target install -- -j4

.github/workflows/build-occt-with-vcpkg.yml

@@ -0,0 +1,170 @@
+# This workflow builds OCCT using vcpkg on multiple platforms (Windows, macOS, Linux).
+# It builds in both Debug and Release modes.
+# All dependencies except the compiler are installed using vcpkg.
+# The workflow includes steps to clone vcpkg, install dependencies, configure and build.
+
+name: Build OCCT with vcpkg
+
+on:
+  push:
+    branches:
+      - 'master'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+env:
+  USERNAME: Open-Cascade-SAS
+  VCPKG_EXE: ${{ github.workspace }}/vcpkg/vcpkg
+  FEED_URL: https://nuget.pkg.github.com/Open-Cascade-SAS/index.json
+  VCPKG_BINARY_SOURCES: "clear;nuget,https://nuget.pkg.github.com/Open-Cascade-SAS/index.json,readwrite"
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, ubuntu-22.04, windows-2022, windows-2019, macos-15, macos-14, macos-13]
+        build_type: [Debug, Release]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.7
+
+    - name: Install required packages (Linux)
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y build-essential ninja-build curl zip unzip tar nasm autoconf mono-complete
+        sudo apt-get install -y libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev
+
+    - name: Install required packages (macOS)
+      if: runner.os == 'macOS'
+      run: |
+        brew update || true
+        brew install cmake ninja nasm autoconf mono || true
+        # temporary workaround for missing tcl-tk
+        brew install tcl-tk || true
+        # Force link any conflicting packages
+        brew link --overwrite python@3.12 || true
+        brew link --overwrite python@3.13 || true
+
+    - name: Install required packages (Windows)
+      if: runner.os == 'Windows'
+      uses: ilammy/msvc-dev-cmd@v1.13.0
+      with:
+        arch: x64
+
+    - name: Set up vcpkg (Unix)
+      if: runner.os != 'Windows'
+      run: |
+        git clone https://github.com/microsoft/vcpkg.git
+        ./vcpkg/bootstrap-vcpkg.sh
+      shell: bash
+
+    - name: Set up vcpkg (Windows)
+      if: runner.os == 'Windows'
+      run: |
+        git clone https://github.com/microsoft/vcpkg.git
+        .\vcpkg\bootstrap-vcpkg.bat
+      shell: cmd
+
+    - name: Add NuGet sources
+      if: runner.os == 'Windows'
+      run: |
+        .$(${{ env.VCPKG_EXE }} fetch nuget) `
+          sources add `
+          -Source "${{ env.FEED_URL }}" `
+          -StorePasswordInClearText `
+          -Name GitHubPackages `
+          -UserName "${{ env.USERNAME }}" `
+          -Password "${{ secrets.GITHUB_TOKEN }}"
+        .$(${{ env.VCPKG_EXE }} fetch nuget) `
+          setapikey "${{ secrets.GITHUB_TOKEN }}" `
+          -Source "${{ env.FEED_URL }}"
+      shell: pwsh
+
+    - name: Add NuGet sources
+      if: runner.os != 'Windows'
+      run: |
+        mono `${{ env.VCPKG_EXE }} fetch nuget | tail -n 1` \
+          sources add \
+          -Source "${{ env.FEED_URL }}" \
+          -StorePasswordInClearText \
+          -Name GitHubPackages \
+          -UserName "${{ env.USERNAME }}" \
+          -Password "${{ secrets.GITHUB_TOKEN }}"
+        mono `${{ env.VCPKG_EXE }} fetch nuget | tail -n 1` \
+          setapikey "${{ secrets.GITHUB_TOKEN }}" \
+          -Source "${{ env.FEED_URL }}"
+      shell: bash
+
+    - name: Configure OCCT ${{ matrix.build_type }} (Unix)
+      if: runner.os != 'Windows'
+      run: |
+        mkdir build-${{ matrix.build_type }}
+        cd build-${{ matrix.build_type }}
+        cmake -G Ninja \
+              -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
+              -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              -DBUILD_USE_VCPKG=ON \
+              -DUSE_MMGR_TYPE=NATIVE \
+              -DUSE_FREETYPE=ON \
+              -DUSE_TK=OFF \
+              -DBUILD_USE_PCH=ON \
+              -DBUILD_INCLUDE_SYMLINK=ON \
+              -DBUILD_LIBRARY_TYPE="Static" \
+              -DINSTALL_DIR=${{ github.workspace }}/install-${{ matrix.build_type }} \
+              -DUSE_DRACO=ON \
+              -DUSE_FFMPEG=ON \
+              -DUSE_FREEIMAGE=ON \
+              -DUSE_GLES2=OFF \
+              -DUSE_VTK=ON \
+              -DUSE_TBB=ON \
+              -DUSE_RAPIDJSON=ON \
+              -DUSE_OPENGL=ON \
+              -DBUILD_MODULE_Draw=OFF \
+              -DVCPKG_INSTALL_OPTIONS=--clean-buildtrees-after-build \
+              ${{ runner.os != 'macOS' && '-DUSE_OPENVR=ON' || '' }} ..
+      shell: bash
+
+    - name: Configure OCCT ${{ matrix.build_type }} (Windows)
+      if: runner.os == 'Windows'
+      run: |
+        mkdir build-${{ matrix.build_type }}
+        cd build-${{ matrix.build_type }}
+        cmake -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ^
+              -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^
+              -DBUILD_USE_VCPKG=ON ^
+              -DUSE_MMGR_TYPE=JEMALLOC ^
+              -DUSE_FREETYPE=ON ^
+              -DUSE_TK=OFF ^
+              -DBUILD_USE_PCH=ON ^
+              -DBUILD_INCLUDE_SYMLINK=ON ^
+              -DINSTALL_DIR=${{ github.workspace }}/install-${{ matrix.build_type }} ^
+              -DUSE_DRACO=ON ^
+              -DUSE_FFMPEG=OFF ^
+              -DUSE_FREEIMAGE=ON ^
+              -DUSE_GLES2=ON ^
+              -DUSE_OPENVR=ON ^
+              -DUSE_VTK=ON ^
+              -DUSE_TBB=ON ^
+              -DUSE_RAPIDJSON=ON ^
+              -DVCPKG_INSTALL_OPTIONS=--clean-buildtrees-after-build ^
+              -DUSE_OPENGL=ON ..
+      shell: cmd
+
+    - name: Build OCCT ${{ matrix.build_type }} (Unix)
+      if: runner.os != 'Windows'
+      run: |
+        cd build-${{ matrix.build_type }}
+        cmake --build . --target install --config ${{ matrix.build_type }}
+      shell: bash
+
+    - name: Build OCCT ${{ matrix.build_type }} (Windows)
+      if: runner.os == 'Windows'
+      run: |
+        cd build-${{ matrix.build_type }}
+        cmake --build . --target install --config ${{ matrix.build_type }}
+      shell: cmd

.gitignore

@@ -54,4 +54,5 @@ win64
 /libtool
 /stamp*
 /build*
-/install
+/install*
+/tools/build*

README.md

@@ -28,26 +28,27 @@ You can also find OCCT pre-installed on your system or install it from packages
 
 Documentation is available at the following links:
 - [Latest version](https://dev.opencascade.org/doc/overview)
-- [Version 7.7](https://dev.opencascade.org/doc/occt-7.7.0/overview)
+- [Version 7.8](https://dev.opencascade.org/doc/occt-7.8.0/overview)
 
 Documentation can be part of the package. To preview documentation as part of the package, open the file `doc/html/index.html` to browse HTML documentation.
 
 If HTML documentation is not available in your package, you can:
 
-- **Generate it from sources:** You need to have Tcl and Doxygen 1.8.4 (or above) installed on your system and accessible in your environment (check the environment variable PATH). Use the batch file `gendoc.bat` on Windows or the Bash script `gendoc` on Linux or OS X to (re)generate documentation.
-- **Read documentation in source plain text (Markdown) format** found in the subfolder `dox`.
+- **Generate it from sources:** You need to have Tcl and Doxygen 1.8.4 (or above) installed on your system and accessible in your environment (check the environment variable PATH). Use the batch file `adm/gendoc.bat` on Windows or the Bash script `adm/gendoc` on Linux or OS X to (re)generate documentation.
+- **Generate together with sources:** You need to have CMake and 1.8.4 (or above) installed on your system. Enable `BUILD_DOC_Overview` CMake parameter and set the path to Doxygen `3RDPARTY_DOXYGEN_EXECUTABLE`. Then build ALL or only `Overview`.
+- **Read documentation in source plain text (Markdown) format** found in the subfolder `dox` or [GitHub Wiki](https://github.com/Open-Cascade-SAS/OCCT/wiki).
 
-See `dox/dev_guides/documentation/documentation.md` or [Building Documentation](https://dev.opencascade.org/doc/occt-7.7.0/overview/html/build_upgrade__building_documentation.html) for details.
+See [dox/build/build_documentation/building_documentation.md](dox/build/build_documentation/building_documentation.md) or [Building Documentation](https://dev.opencascade.org/doc/occt-7.8.0/overview/html/build_upgrade__building_documentation.html) for details.
 
 ## Building
 
 In most cases, you need to rebuild OCCT on your platform (OS, compiler) before using it in your project to ensure binary compatibility.
 
-Consult the file `dox/dev_guides/building/building.md` or [Building OCCT](https://dev.opencascade.org/doc/overview/html/build_upgrade__building_occt.html) for instructions on building OCCT from sources on supported platforms.
+Consult the file [dox/build/build_occt/building_occt.md](dox/build/build_occt/building_occt.md) or [Building OCCT](https://dev.opencascade.org/doc/overview/html/build_upgrade__building_occt.html) or [Building OCCT Wiki](https://github.com/Open-Cascade-SAS/OCCT/wiki/build_upgrade) for instructions on building OCCT from sources on supported platforms.
 
 ## Version
 
-The current version of OCCT can be found in the file `src/Standard/Standard_Version.hxx`.
+The current version of OCCT can be found in the file [`adm/cmake/version.cmake`](adm/cmake/version.cmake).
 
 ## Development
 

adm/cmake/3rdparty_macro.cmake

@@ -121,7 +121,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
 #    if (BUILD_SHARED_LIBS)
       # library
       if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
-        set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+        set (CMAKE_FIND_LIBRARY_SUFFIXES .dll.a .lib .so .dylib .a)
 
         set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
         if (WIN32)
@@ -364,25 +364,3 @@ macro (COMPLIANCE_PRODUCT_CONSISTENCY LIBNAME)
     endif()
   endif()
 endmacro()
-
-macro(CONFIGURE_DRACO_DEPS)
-  if (USE_DRACO)
-    set (USED_LIB_RELEASE ${3RDPARTY_DRACO_LIBRARY})
-    if (WIN32)
-      set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY_DEBUG})
-    else()
-      set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY})
-    endif()
-    set (USED_LIB_CONF)
-    if (EXISTS ${USED_LIB_DEBUG})
-      set (USED_LIB_CONF "$<$<CONFIG:DEBUG>:${USED_LIB_DEBUG}>;${USED_LIB_CONF}")
-    endif()
-    if (EXISTS ${USED_LIB_RELEASE})
-      set (USED_LIB_CONF "$<$<CONFIG:RELEASE>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}")
-      set (USED_LIB_CONF "$<$<CONFIG:RELWITHDEBINFO>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}")
-    endif()
-    if (DEFINED USED_LIB_CONF)
-      set_property (TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_LIBRARIES "${USED_LIB_CONF}")
-    endif()
-  endif()
-endmacro()

adm/cmake/draco.cmake

@@ -1,6 +1,51 @@
 # Draco - a library for a lossy vertex data compression, used as extension to glTF format.
 # https://github.com/google/draco
 
+macro (SEARCH_DRACO_LIB)
+  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+    if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+      set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
+  
+      find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
+                                           PATHS "${3RDPARTY_DRACO_DIR}"
+                                           PATH_SUFFIXES lib
+                                           CMAKE_FIND_ROOT_PATH_BOTH
+                                           NO_DEFAULT_PATH)
+      if (3RDPARTY_DRACO_LIBRARY AND EXISTS "${3RDPARTY_DRACO_LIBRARY}")
+        get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY}" PATH)
+        set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
+      endif()
+    endif()
+  
+    if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+      set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
+  
+      find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
+                                           PATHS "${3RDPARTY_DRACO_DIR}"
+                                           PATH_SUFFIXES libd debug/lib
+                                           CMAKE_FIND_ROOT_PATH_BOTH
+                                           NO_DEFAULT_PATH)
+      if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
+        get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
+        set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
+      endif()
+    endif()
+  endif()
+endmacro()
+
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package (draco CONFIG REQUIRED)
+
+  set (3RDPARTY_DRACO_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+  SEARCH_DRACO_LIB()
+
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/draco")
+  return()
+endif()
+
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
 if (NOT DEFINED 3RDPARTY_DRACO_DIR)
@@ -65,34 +110,4 @@ else()
   list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DRACO_INCLUDE_DIR)
 endif()
 
-if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-  if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-    set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
-
-    find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
-                                         PATH_SUFFIXES lib
-                                         CMAKE_FIND_ROOT_PATH_BOTH
-                                         NO_DEFAULT_PATH)
-    if (3RDPARTY_DRACO_LIBRARY AND EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY}" PATH)
-      set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
-    endif()
-  endif()
-
-  if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
-
-    find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
-                                         PATH_SUFFIXES libd
-                                         CMAKE_FIND_ROOT_PATH_BOTH
-                                         NO_DEFAULT_PATH)
-    if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
-      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
-      set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
-    endif()
-  endif()
-endif()
+SEARCH_DRACO_LIB()

adm/cmake/ffmpeg.cmake

@@ -1,4 +1,15 @@
-# FFmpeg
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package(FFMPEG REQUIRED)
+  set(CSF_FFmpeg ${FFMPEG_LIBRARIES})
+  if (WIN32)
+    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS}")
+  return()
+endif()
 
 if (NOT DEFINED INSTALL_FFMPEG)
   set (INSTALL_FFMPEG OFF CACHE BOOL "${INSTALL_FFMPEG_DESCR}")

adm/cmake/freeimage.cmake

@@ -1,3 +1,16 @@
 #freeimage
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+find_package(freeimage CONFIG REQUIRED)
+  set(CSF_FreeImagePlus freeimage::FreeImagePlus)
+  if (WIN32)
+    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/")
+  return()
+endif()
+
 THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "CSF_FreeImagePlus" "d")

adm/cmake/freetype.cmake

@@ -1,5 +1,18 @@
 # freetype
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package (Freetype MODULE REQUIRED)
+  set (CSF_FREETYPE Freetype::Freetype)
+  if (WIN32)
+    set (USED_3RDPARTY_FREETYPE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_FREETYPE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+  return()
+endif()
+
 if (NOT DEFINED INSTALL_FREETYPE AND BUILD_SHARED_LIBS)
   set (INSTALL_FREETYPE OFF CACHE BOOL "${INSTALL_FREETYPE_DESCR}")
 endif()
@@ -164,6 +177,14 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
       set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
     endif()
   endif()
+
+  # In case of MinGW some libraries can have .dll.a extension, so we should check it and use instead of .a
+  if (MINGW AND 3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+    string (REPLACE ".a" ".dll.a" 3RDPARTY_FREETYPE_LIBRARY_TEST "${3RDPARTY_FREETYPE_LIBRARY}")
+    if (EXISTS "${3RDPARTY_FREETYPE_LIBRARY_TEST}")
+      set (3RDPARTY_FREETYPE_LIBRARY "${3RDPARTY_FREETYPE_LIBRARY_TEST}" CACHE FILEPATH "The path to freetype library" FORCE)
+    endif()
+  endif()
 endif()
 
 # the SECOND step in search for freetype library and header folders (additional search algorithms)

adm/cmake/jemalloc.cmake

@@ -1,6 +1,6 @@
 # JeMalloc
 
-macro (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
+function (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
   if (NOT 3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB})
     set (JEMALLOC_PATH_SUFFIXES "lib" "bin")
     set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}-NOTFOUND")
@@ -23,20 +23,25 @@ macro (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
     endif()
   endif()
   if (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB})
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}" PARENT_SCOPE)
     set (3RDPARTY_JEMALLOC_LIBRARY_DIR "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}" CACHE PATH "The directory containing JEMALLOC libraries" FORCE)
   elseif("${PREFIX}" STREQUAL "SHARED")
     return()
   else()
     message(STATUS "Cannot find ${MMGR_LIB} library in jemalloc 3rdparty")
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB})
-    set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "")
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} PARENT_SCOPE)
+    set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "" PARENT_SCOPE)
   endif()
-  set (JEMALLOC_IS_STATIC_LIB FALSE)
-  if (((${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} MATCHES "\.lib$")) OR ((${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} MATCHES "\.a$")))
-    get_filename_component(STATIC_LIB_NAME ${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} NAME)
-    list(APPEND CSF_MMGR "${STATIC_LIB_NAME}")
-    set (JEMALLOC_IS_STATIC_LIB TRUE)
+
+  set(JEMALLOC_IS_STATIC_LIB FALSE)
+  if ("${PREFIX}" STREQUAL "STATIC")
+    set(JEMALLOC_IS_STATIC_LIB TRUE)
+  endif()
+
+  if (${JEMALLOC_IS_STATIC_LIB})
+    set (OLD_CSF_MMGR ${CSF_MMGR})
+    list (APPEND OLD_CSF_MMGR "${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}}")
+    set (CSF_MMGR "${OLD_CSF_MMGR}" PARENT_SCOPE)
   endif()
   # install instructions
   if (INSTALL_JEMALLOC AND NOT JEMALLOC_IS_STATIC_LIB)
@@ -57,18 +62,18 @@ macro (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
                  CONFIGURATIONS RelWithDebInfo
                  DESTINATION "${JEMALLOC_INSTALL_DESTINATION}i")
     endif()
-    set (USED_3RDPARTY_JEMALLOC_DIR "")
+    set (USED_3RDPARTY_JEMALLOC_DIR "" PARENT_SCOPE)
   elseif(NOT JEMALLOC_IS_STATIC_LIB)
     # the library directory for using by the executable
-    set (USED_3RDPARTY_JEMALLOC_DIR ${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}})
+    set (USED_3RDPARTY_JEMALLOC_DIR ${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}} PARENT_SCOPE)
   endif()
   unset(3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} CACHE)
   unset(3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} CACHE)
-endmacro()
+endfunction()
 
 macro (SEARCH_JEMALLOC)
   # find static jemalloc lib
-  SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+  SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".lib" ".a")
   if (WIN32)
     JEMALLOC_LIB_SEARCH ("jemalloc" "STATIC")
   elseif(NOT WIN32)
@@ -85,6 +90,16 @@ endmacro()
 # Reset CSF variable
 set (CSF_MMGR "")
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  set (3RDPARTY_JEMALLOC_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+  OCCT_CHECK_AND_UNSET_GROUP (3RDPARTY_JEMALLOC_LIBRARY_SHARED)
+  OCCT_CHECK_AND_UNSET_GROUP (3RDPARTY_JEMALLOC_LIBRARY_STATIC)
+  SEARCH_JEMALLOC()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/jemalloc")
+  return()
+endif()
+
 if (NOT DEFINED INSTALL_JEMALLOC)
   set (INSTALL_JEMALLOC OFF CACHE BOOL "${INSTALL_INSTALL_JEMALLOC_DESCR}")
 endif()

adm/cmake/occt_csf.cmake

@@ -82,6 +82,25 @@ else()
   set (CSF_Draco)
 endif()
 
+# VTK
+if (USE_VTK)
+  # the variable must to be empty, but keep there the list of libs
+  # that is used in the VTK component.
+  set (CSF_VTK
+  #   vtkCommonCore
+  #   vtkRenderingCore
+  #   vtkRenderingFreeType
+  #   vtkFiltersGeneral
+  #   vtkIOImage
+  #   vtkImagingCore
+  #   vtkInteractionStyle
+  #   vtkRenderingOpenGL
+  #   vtkRenderingFreeTypeOpenGL
+  )
+else()
+  set (CSF_VTK)
+endif()
+
 if (WIN32)
   set (CSF_advapi32      "advapi32.lib")
   set (CSF_gdi32         "gdi32.lib")

adm/cmake/occt_defs_flags.cmake

@@ -26,7 +26,7 @@ endif()
 
 if (MSVC)
   # suppress C26812 on VS2019/C++20 (prefer 'enum class' over 'enum')
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd\"26812\"")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd26812")
   # suppress warning on using portable non-secure functions in favor of non-portable secure ones
   add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
 else()
@@ -38,6 +38,10 @@ else()
   else()
    add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
   endif()
+  if (APPLE)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wno-deprecated-declarations")
+  endif()
   add_definitions(-DOCC_CONVERT_SIGNALS)
 endif()
 
@@ -147,14 +151,31 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPIL
     # /GL (whole program optimization) is similar to -flto (Link Time Optimization) in GCC/Clang.
     # /GF (eliminate duplicate strings) doesn't have a direct equivalent in GCC/Clang, but the compilers do string pooling automatically.
     # /Gy (enable function-level linking) is similar to -ffunction-sections in GCC/Clang.
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer -flto -ffunction-sections")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -fomit-frame-pointer -flto -ffunction-sections")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fomit-frame-pointer")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -fomit-frame-pointer")
+    
+    # Apply LTO optimization on all platforms
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto")
+    
+    # Apply function sections only on non-macOS platforms
+    if (NOT APPLE)
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffunction-sections")
+      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffunction-sections")
+    endif()
 
-    # Link-Time Code Generation(LTCG) is requared for Whole Program Optimisation(GL)
+    # Link-Time Code Generation (LTCG) is required for Whole Program Optimization
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -flto -Wl,--gc-sections")
-    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} -flto -Wl,--gc-sections")
-    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -Wl,--gc-sections")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -flto")
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} -flto")
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto")
+    
+    # Add garbage collection sections only on Linux (not on macOS or Windows)
+    if (NOT WIN32 AND NOT APPLE)
+      set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--gc-sections")
+      set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} -Wl,--gc-sections")
+      set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -Wl,--gc-sections")
+    endif()
   endif()
   if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
@@ -173,19 +194,21 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
     # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
     set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
   endif()
-  # Optimize size of binaries
-  set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
-elseif(MINGW)
+  if (NOT WIN32)
+    # Optimize size of binaries
+    set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
+  endif()
+endif()
+if(MINGW)
   add_definitions(-D_WIN32_WINNT=0x0601)
   # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
   #set (CMAKE_SYSTEM_VERSION "6.1")
   # workaround bugs in mingw with vtable export
   set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
-
-  # Optimize size of binaries
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wattributes")
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wattributes")
+endif()
+if (CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
   # Optimize size of binaries
   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
   set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")

adm/cmake/occt_macros.cmake

@@ -34,9 +34,7 @@ endmacro()
 
 function (FILE_TO_LIST FILE_NAME FILE_CONTENT)
   set (LOCAL_FILE_CONTENT)
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${FILE_NAME}")
-    file (STRINGS "${BUILD_PATCH}/${FILE_NAME}" LOCAL_FILE_CONTENT)
-  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}")
+  if (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}")
     file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
   endif()
 
@@ -44,9 +42,7 @@ function (FILE_TO_LIST FILE_NAME FILE_CONTENT)
 endfunction()
 
 function(FIND_FOLDER_OR_FILE FILE_OR_FOLDER_NAME RESULT_PATH)
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${FILE_OR_FOLDER_NAME}")
-    set (${RESULT_PATH} "${BUILD_PATCH}/${FILE_OR_FOLDER_NAME}" PARENT_SCOPE)
-  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_OR_FOLDER_NAME}")
+  if (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_OR_FOLDER_NAME}")
     set (${RESULT_PATH} "${CMAKE_SOURCE_DIR}/${FILE_OR_FOLDER_NAME}" PARENT_SCOPE)
   else()
     set (${RESULT_PATH} "" PARENT_SCOPE)
@@ -75,6 +71,10 @@ endmacro()
 # COMPILER variable
 macro (OCCT_MAKE_COMPILER_SHORT_NAME)
   if (MSVC)
+    if (MSVC_VERSION LESS 1914)
+      message (AUTHOR_WARNING "Microsoft Visual C++ 19.14 (VS 2017 15.7) or newer is required for C++17 support")
+    endif()
+    
     if ((MSVC_VERSION EQUAL 1300) OR (MSVC_VERSION EQUAL 1310))
       set (COMPILER vc7)
     elseif (MSVC_VERSION EQUAL 1400)
@@ -92,20 +92,39 @@ macro (OCCT_MAKE_COMPILER_SHORT_NAME)
     elseif ((MSVC_VERSION GREATER 1900) AND (MSVC_VERSION LESS 2000))
       # Since Visual Studio 15 (2017), its version diverged from version of
       # compiler which is 14.1; as that compiler uses the same run-time as 14.0,
-      # we keep its id as "vc14" to be compatibille
+      # we keep its id as "vc14" to be compatible
       set (COMPILER vc14)
     else()
       message (FATAL_ERROR "Unrecognized MSVC_VERSION")
     endif()
   elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+      message (AUTHOR_WARNING "GCC version 8.0 or newer is required for C++17 support")
+    endif()
     set (COMPILER gcc)
   elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+      message (AUTHOR_WARNING "GCC version 8.0 or newer is required for C++17 support")
+    endif()
     set (COMPILER gxx)
   elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
+    if(APPLE)
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0.0)
+        message (AUTHOR_WARNING "Apple Clang version 11.0.0 or newer is required for C++17 support")
+      endif()
+    else()
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+        message (AUTHOR_WARNING "Clang version 7.0 or newer is required for C++17 support")
+      endif()
+    endif()
     set (COMPILER clang)
   elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Ii][Nn][Tt][Ee][Ll]")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17.1.1)
+      message (AUTHOR_WARNING "Intel C++ Compiler version 17.1.1 or newer is required for C++17 support")
+    endif()
     set (COMPILER icc)
   else()
+    message (AUTHOR_WARNING "Unknown compiler - please verify C++17 support")
     set (COMPILER ${CMAKE_GENERATOR})
     string (REGEX REPLACE " " "" COMPILER ${COMPILER})
   endif()
@@ -152,25 +171,8 @@ function (FIND_SUBDIRECTORY ROOT_DIRECTORY DIRECTORY_SUFFIX SUBDIRECTORY_NAME)
 endfunction()
 
 function (OCCT_ORIGIN_AND_PATCHED_FILES RELATIVE_PATH SEARCH_TEMPLATE RESULT)
-
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}")
-    file (GLOB FOUND_FILES "${BUILD_PATCH}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
-  endif()
-
   file (GLOB ORIGIN_FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
-  foreach (ORIGIN_FILE ${ORIGIN_FILES})
-    # check for existence of patched version of current file
-    if (NOT BUILD_PATCH OR NOT EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}")
-      list (APPEND FOUND_FILES ${ORIGIN_FILE})
-    else()
-      get_filename_component (ORIGIN_FILE_NAME "${ORIGIN_FILE}" NAME)
-      if (NOT EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}/${ORIGIN_FILE_NAME}")
-        list (APPEND FOUND_FILES ${ORIGIN_FILE})
-      endif()
-    endif()
-  endforeach()
-
-  set (${RESULT} ${FOUND_FILES} PARENT_SCOPE)
+  set (${RESULT} ${ORIGIN_FILES} PARENT_SCOPE)
 endfunction()
 
 function (FILLUP_PRODUCT_SEARCH_TEMPLATE PRODUCT_NAME COMPILER COMPILER_BITNESS SEARCH_TEMPLATES)
@@ -226,32 +228,15 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
 endfunction()
 
 macro (OCCT_INSTALL_FILE_OR_DIR BEING_INSTALLED_OBJECT DESTINATION_PATH)
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}")
-    if (IS_DIRECTORY "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}")
-      # first of all, install original files
-      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-
-      # secondly, rewrite original files with patched ones
-      install (DIRECTORY "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-    else()
-      install (FILES     "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-    endif()
+  if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}")
+    install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
   else()
-    if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}")
-      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-    else()
-      install (FILES     "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-    endif()
+    install (FILES     "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
   endif()
 endmacro()
 
 macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE BUILD_NAME INSTALL_NAME DESTINATION_PATH)
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}")
-    configure_file("${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY)
-  else()
-    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY)
-  endif()
-
+  configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY)
   install(FILES "${OCCT_BINARY_DIR}/${BUILD_NAME}" DESTINATION  "${DESTINATION_PATH}" RENAME ${INSTALL_NAME})
 endmacro()
 
@@ -291,10 +276,7 @@ function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_I
     return()
   endif()
 
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES")
-    file (STRINGS "${BUILD_PATCH}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES" OCCT_PACKAGE_FILES)
-    set (OCCT_PACKAGE_INCLUDE_DIR "${BUILD_PATCH}/${RELATIVE_PATH}/${OCCT_PACKAGE}")
-  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES")
+  if (EXISTS "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES")
     file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES" OCCT_PACKAGE_FILES)
     set (OCCT_PACKAGE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}")
   endif()
@@ -308,15 +290,13 @@ function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_I
     FIND_FOLDER_OR_FILE ("${RELATIVE_PATH}/${OCCT_PACKAGE}/${OCCT_FILE}" CUSTOM_FILE_PATH)
     if (CUSTOM_FILE_PATH)
       list (APPEND FILE_PATH_LIST "${CUSTOM_FILE_PATH}")
+    else()
+      message(WARNING "File ${OCCT_FILE} has not been found in ${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}")
     endif()
   endforeach()
 
   if (NOT FILE_PATH_LIST)
-    if(BUILD_PATH)
-      message (WARNING "FILES has not been found in ${BUILD_PATCH}/${RELATIVE_PATH}/${OCCT_PACKAGE}")
-    else()
-      message (WARNING "FILES has not been found in ${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}")
-    endif()
+    message (WARNING "FILES has not been found in ${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}")
   endif()
 
   set (${RESULT_FILES} ${FILE_PATH_LIST} PARENT_SCOPE)
@@ -389,9 +369,7 @@ endfunction()
 
 function (FILE_TO_LIST FILE_NAME FILE_CONTENT)
   set (LOCAL_FILE_CONTENT)
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${FILE_NAME}")
-    file (STRINGS "${BUILD_PATCH}/${FILE_NAME}" LOCAL_FILE_CONTENT)
-  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}")
+  if (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}")
     file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
   endif()
 
@@ -403,9 +381,6 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_ROOT_TARGET_OCCT_DIR THE_OCC
 
   # consider patched header.in template
   set (TEMPLATE_HEADER_PATH "${CMAKE_SOURCE_DIR}/adm/templates/header.in")
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/header.in")
-    set (TEMPLATE_HEADER_PATH "${BUILD_PATCH}/adm/templates/header.in")
-  endif()
 
   set (OCCT_HEADER_FILES_COMPLETE)
   foreach(OCCT_TOOLKIT ${THE_OCCT_BUILD_TOOLKITS})
@@ -414,29 +389,78 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_ROOT_TARGET_OCCT_DIR THE_OCC
     foreach(OCCT_PACKAGE ${USED_PACKAGES})
       EXTRACT_PACKAGE_FILES (${THE_RELATIVE_PATH} ${OCCT_PACKAGE} ALL_FILES _)
       set (HEADER_FILES_FILTERING ${ALL_FILES})
-      list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|lxx|gxx)")
+      list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|g|p|lxx|hxx|pxx|hpp|gxx)$")
       list (APPEND OCCT_HEADER_FILES_COMPLETE ${HEADER_FILES_FILTERING})
     endforeach()
+    # parse root of the toolkit file
+    EXTRACT_PACKAGE_FILES (${THE_RELATIVE_PATH} ${OCCT_TOOLKIT} ALL_FILES _)
+    set (HEADER_FILES_FILTERING ${ALL_FILES})
+    list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|g|p|lxx|hxx|pxx|hpp|gxx)$")
+    list (APPEND OCCT_HEADER_FILES_COMPLETE ${HEADER_FILES_FILTERING})
   endforeach()
 
+  # Check that copying is done and match the include installation type.
+  # Check by first file in list.
+  list(GET OCCT_HEADER_FILES_COMPLETE 0 FIRST_OCCT_HEADER_FILE)
+  get_filename_component (FIRST_OCCT_HEADER_FILE ${FIRST_OCCT_HEADER_FILE} NAME)
+  set (TO_FORCE_COPY FALSE)
+  if (NOT EXISTS "${THE_ROOT_TARGET_OCCT_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}/${FIRST_OCCT_HEADER_FILE}")
+    set (TO_FORCE_COPY TRUE)
+  else()
+    # get content and check the number of lines inside file.
+    # If more then 1 then it is a symlink.
+    file (STRINGS "${THE_ROOT_TARGET_OCCT_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}/${FIRST_OCCT_HEADER_FILE}" FIRST_OCCT_HEADER_FILE_CONTENT)
+    list (LENGTH FIRST_OCCT_HEADER_FILE_CONTENT FIRST_OCCT_HEADER_FILE_CONTENT_LEN)
+    if (${FIRST_OCCT_HEADER_FILE_CONTENT_LEN} EQUAL 1 AND BUILD_INCLUDE_SYMLINK)
+      set (TO_FORCE_COPY TRUE)
+    elseif(${FIRST_OCCT_HEADER_FILE_CONTENT_LEN} GREATER 1 AND NOT BUILD_INCLUDE_SYMLINK)
+      set (TO_FORCE_COPY TRUE)
+    endif()
+  endif()
+  
   foreach (OCCT_HEADER_FILE ${OCCT_HEADER_FILES_COMPLETE})
     get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
-    if (BUILD_INCLUDE_SYMLINK)
-      file (CREATE_LINK "${OCCT_HEADER_FILE}" "${THE_ROOT_TARGET_OCCT_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}/${HEADER_FILE_NAME}" SYMBOLIC)
-    else()
-      set (OCCT_HEADER_FILE_CONTENT "#include \"${OCCT_HEADER_FILE}\"")
-      configure_file ("${TEMPLATE_HEADER_PATH}" "${THE_ROOT_TARGET_OCCT_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}/${HEADER_FILE_NAME}" @ONLY)
+    set(TARGET_FILE "${THE_ROOT_TARGET_OCCT_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}/${HEADER_FILE_NAME}")
+
+    # Check if the file already exists in the target directory
+    if (TO_FORCE_COPY OR NOT EXISTS "${TARGET_FILE}")
+      if (BUILD_INCLUDE_SYMLINK)
+        file (CREATE_LINK "${OCCT_HEADER_FILE}" "${TARGET_FILE}" SYMBOLIC)
+      else()
+        set (OCCT_HEADER_FILE_CONTENT "#include \"${OCCT_HEADER_FILE}\"")
+        configure_file ("${TEMPLATE_HEADER_PATH}" "${TARGET_FILE}" @ONLY)
+      endif()
     endif()
   endforeach()
 
-  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}")
+  set (OCCT_HEADER_FILES_INSTALLATION ${OCCT_HEADER_FILES_COMPLETE})
+  list (FILTER OCCT_HEADER_FILES_INSTALLATION INCLUDE REGEX ".*[.](h|hxx|lxx)$")
+  install (FILES ${OCCT_HEADER_FILES_INSTALLATION} DESTINATION "${INSTALL_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}")
 endfunction()
 
-function(ADD_PRECOMPILED_HEADER INPUT_TARGET PRECOMPILED_HEADER)
+# Macro to configure and install Standard_Version.hxx file
+macro (CONFIGURE_AND_INSTALL_VERSION_HEADER)
+  if (DEFINED BUILD_OCCT_VERSION_EXT AND "${BUILD_OCCT_VERSION_EXT}" STREQUAL "${OCC_VERSION_STRING_EXT}" AND EXISTS "${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/Standard_Version.hxx")
+    install(FILES "${OCCT_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/Standard_Version.hxx" DESTINATION  "${INSTALL_DIR}/${INSTALL_DIR_INCLUDE}")
+  else()
+    set(BUILD_OCCT_VERSION_EXT "${OCC_VERSION_STRING_EXT}" CACHE STRING "OCCT Version string. Used only for caching, can't impact on build. For modification of version, please check adm/cmake/version.cmake" FORCE)
+    mark_as_advanced(BUILD_OCCT_VERSION_EXT)
+    string(TIMESTAMP OCCT_VERSION_DATE "%Y-%m-%d" UTC)
+    OCCT_CONFIGURE_AND_INSTALL ("adm/templates/Standard_Version.hxx.in" "${INSTALL_DIR_INCLUDE}/Standard_Version.hxx" "Standard_Version.hxx" "${INSTALL_DIR}/${INSTALL_DIR_INCLUDE}")
+  endif()
+endmacro()
+
+function(ADD_PRECOMPILED_HEADER INPUT_TARGET PRECOMPILED_HEADER THE_IS_PRIVATE)
   if (NOT BUILD_USE_PCH)
     return()
   endif()
-  target_precompile_headers(${INPUT_TARGET} PUBLIC "$<$<COMPILE_LANGUAGE:CXX>:${PRECOMPILED_HEADER}>")
+
+  # Angular bracket syntax is achieved using $<ANGLE-R> for closing bracket
+  if (${THE_IS_PRIVATE})
+    target_precompile_headers(${INPUT_TARGET} PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:<${PRECOMPILED_HEADER}$<ANGLE-R>>")
+  else()
+    target_precompile_headers(${INPUT_TARGET} PUBLIC "$<$<COMPILE_LANGUAGE:CXX>:<${PRECOMPILED_HEADER}$<ANGLE-R>>")
+  endif()
 endfunction()
 
 macro (OCCT_COPY_FILE_OR_DIR BEING_COPIED_OBJECT DESTINATION_PATH)
@@ -444,25 +468,14 @@ macro (OCCT_COPY_FILE_OR_DIR BEING_COPIED_OBJECT DESTINATION_PATH)
   if (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}")
     file (COPY "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
   endif()
-
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_COPIED_OBJECT}")
-    # secondly, rewrite original files with patched ones
-    file (COPY "${BUILD_PATCH}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-  endif()
 endmacro()
 
 macro (OCCT_CONFIGURE BEING_CONGIRUGED_FILE FINAL_NAME)
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}")
-    configure_file("${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
-  else()
-    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
-  endif()
+  configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
 endmacro()
 
 macro (OCCT_ADD_SUBDIRECTORY BEING_ADDED_DIRECTORY)
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
-    add_subdirectory(${BUILD_PATCH}/${BEING_ADDED_DIRECTORY})
-  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
+  if (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
     add_subdirectory (${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY})
   else()
     message (STATUS "${BEING_ADDED_DIRECTORY} directory is not included")
@@ -520,42 +533,80 @@ function (OCCT_MODULES_AND_TOOLKITS FILE_NAME TOOLKITS_NAME_SUFFIX MODULE_LIST)
   set (${MODULE_LIST} ${${MODULE_LIST}} PARENT_SCOPE)
 endfunction()
 
-# Returns OCC version string from file Standard_Version.hxx (if available)
+
+# Macro to extract git hash from the source directory
+# and store it in the variable GIT_HASH
+# in case if git is not found or error occurs, GIT_HASH is set to empty string
+macro(OCCT_GET_GIT_HASH)
+  set(GIT_HASH "")
+  
+  find_package(Git QUIET)
+  if(GIT_FOUND)
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE GIT_HASH
+      ERROR_VARIABLE GIT_ERROR 
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if(NOT GIT_ERROR)
+      # Check if working directory is clean
+      execute_process(
+        COMMAND ${GIT_EXECUTABLE} status --porcelain
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_STATUS
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+      if(NOT "${GIT_STATUS}" STREQUAL "")
+        message(DEBUG "Git working directory is not clean. Git hash may be incorrect.")
+      endif()
+    else()
+      set(GIT_HASH "")
+    endif()
+  endif()
+endmacro()
+
+# Returns OCC version string
 function (OCC_VERSION OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE OCC_VERSION_DEVELOPMENT OCC_VERSION_STRING_EXT)
 
-  set (OCC_VERSION_MAJOR         7)
-  set (OCC_VERSION_MINOR         0)
-  set (OCC_VERSION_MAINTENANCE   0)
-  set (OCC_VERSION_DEVELOPMENT   dev)
-  set (OCC_VERSION_COMPLETE      "7.0.0")
- 
-  set (STANDARD_VERSION_FILE "${CMAKE_SOURCE_DIR}/src/Standard/Standard_Version.hxx")
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/Standard/Standard_Version.hxx")
-    set (STANDARD_VERSION_FILE "${BUILD_PATCH}/src/Standard/Standard_Version.hxx")
-  endif()
+  include (version)
+  set (OCC_VERSION_COMPLETE "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
+  set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}")
 
-  if (EXISTS "${STANDARD_VERSION_FILE}")
-    foreach (SOUGHT_VERSION OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE)
-      file (STRINGS "${STANDARD_VERSION_FILE}" ${SOUGHT_VERSION} REGEX "^#define ${SOUGHT_VERSION} .*")
-      string (REGEX REPLACE ".*${SOUGHT_VERSION} .*([^ ]+).*" "\\1" ${SOUGHT_VERSION} "${${SOUGHT_VERSION}}" )
-    endforeach()
-    
-    foreach (SOUGHT_VERSION OCC_VERSION_DEVELOPMENT OCC_VERSION_COMPLETE)
-      file (STRINGS "${STANDARD_VERSION_FILE}" ${SOUGHT_VERSION} REGEX "^#define ${SOUGHT_VERSION} .*")
-      string (REGEX REPLACE ".*${SOUGHT_VERSION} .*\"([^ ]+)\".*" "\\1" ${SOUGHT_VERSION} "${${SOUGHT_VERSION}}" )
-    endforeach()
-  endif()
- 
   set (OCC_VERSION_MAJOR "${OCC_VERSION_MAJOR}" PARENT_SCOPE)
   set (OCC_VERSION_MINOR "${OCC_VERSION_MINOR}" PARENT_SCOPE)
   set (OCC_VERSION_MAINTENANCE "${OCC_VERSION_MAINTENANCE}" PARENT_SCOPE)
-  set (OCC_VERSION_DEVELOPMENT "${OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
-  
-  if (OCC_VERSION_DEVELOPMENT AND OCC_VERSION_COMPLETE)
-    set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}.${OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
-  else()
-    set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}" PARENT_SCOPE)
+  set (OCCT_ON_DEVELOPMENT OFF)
+  if (NOT "${OCC_VERSION_DEVELOPMENT}" STREQUAL "" AND NOT "${OCC_VERSION_DEVELOPMENT}" STREQUAL "OCC_VERSION_DEVELOPMENT")
+    set (OCCT_ON_DEVELOPMENT ON)
   endif()
+  if (${OCCT_ON_DEVELOPMENT})
+    set (OCC_VERSION_DEVELOPMENT "${OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
+  endif()
+  
+  set (SET_OCC_VERSION_DEVELOPMENT "")
+  if (${OCCT_ON_DEVELOPMENT})
+    # Use special flag from cache to turn on or off git hash extraction
+    if (NOT DEFINED USE_GIT_HASH)
+      set (USE_GIT_HASH ON CACHE BOOL "Use git hash in version string")
+    endif()
+    if (${USE_GIT_HASH})
+      OCCT_GET_GIT_HASH()
+    endif()
+    if (NOT "${GIT_HASH}" STREQUAL "")
+      set (OCC_VERSION_DEVELOPMENT "${OCC_VERSION_DEVELOPMENT}-${GIT_HASH}")
+      set (OCC_VERSION_DEVELOPMENT "${OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
+    else()
+      set (OCC_VERSION_DEVELOPMENT "${OCC_VERSION_DEVELOPMENT}")
+    endif()
+    set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}.${OCC_VERSION_DEVELOPMENT}")
+    set (OCC_VERSION_STRING_EXT "${OCC_VERSION_STRING_EXT}" PARENT_SCOPE)
+    set (SET_OCC_VERSION_DEVELOPMENT "#define OCC_VERSION_DEVELOPMENT \"${OCC_VERSION_DEVELOPMENT}\"")
+    set (SET_OCC_VERSION_DEVELOPMENT "${SET_OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
+  else()
+    OCCT_CHECK_AND_UNSET(USE_GIT_HASH)
+  endif()
+  set (OCC_VERSION_STRING_EXT "${OCC_VERSION_STRING_EXT}" PARENT_SCOPE)
 endfunction()
 
 macro (CHECK_PATH_FOR_CONSISTENCY THE_ROOT_PATH_NAME THE_BEING_CHECKED_PATH_NAME THE_VAR_TYPE THE_MESSAGE_OF_BEING_CHECKED_PATH)
@@ -659,7 +710,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
 
   install (CODE
   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
-  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
   foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
     file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
     file (REMOVE \"\${TARGET_FILENAME}\")
@@ -699,3 +750,126 @@ macro (OCCT_CREATE_SYMLINK_TO_FILE LIBRARY_NAME LINK_NAME)
     ")
   endif()
 endmacro()
+
+# Function to process CSF libraries and append their file names to a specified list.
+# Additionally, handle library directories for different build configurations.
+# Arguments:
+#   CURRENT_CSF - The current CSF libraries to process.
+#   LIST_NAME - The name of the list to append the processed library file names to.
+#   TARGET_NAME - The target to which the library directories will be added.
+function (PROCESS_CSF_LIBRARIES CURRENT_CSF LIST_NAME TARGET_NAME)
+  separate_arguments (CURRENT_CSF)
+
+  # Local variables to collect found libraries and directories
+  set(FOUND_LIBS "")
+  set(FOUND_DEBUG_DIRS "")
+  set(FOUND_RELEASE_DIRS "")
+
+  # Check if the result is already cached
+  string(REPLACE ";" "_" CACHE_KEY "${CURRENT_CSF}")
+  get_property(CACHED_LIBS GLOBAL PROPERTY "CACHED_LIBS_${CACHE_KEY}" SET)
+  get_property(CACHED_DEBUG_DIRS GLOBAL PROPERTY "CACHED_DEBUG_DIRS_${CACHE_KEY}" SET)
+  get_property(CACHED_RELEASE_DIRS GLOBAL PROPERTY "CACHED_RELEASE_DIRS_${CACHE_KEY}" SET)
+  if (CACHED_LIBS AND NOT "${CACHED_LIBS}" STREQUAL "1")
+    list (APPEND FOUND_LIBS ${CACHED_LIBS})
+    if (CACHED_DEBUG_DIRS)
+      list (APPEND FOUND_DEBUG_DIRS ${CACHED_DEBUG_DIRS})
+    endif()
+    if (CACHED_RELEASE_DIRS)
+      list (APPEND FOUND_RELEASE_DIRS ${CACHED_RELEASE_DIRS})
+    endif()
+  else()
+    foreach (CSF_LIBRARY ${CURRENT_CSF})
+      set (LIBRARY_FROM_CACHE 0)
+      set (CSF_LIBRARY_ORIGINAL ${CSF_LIBRARY})
+      string (TOLOWER "${CSF_LIBRARY}" CSF_LIBRARY)
+      string (REPLACE "+" "[+]" CSF_LIBRARY "${CSF_LIBRARY}")
+      string (REPLACE "." "" CSF_LIBRARY "${CSF_LIBRARY}")
+      get_cmake_property(ALL_CACHE_VARIABLES CACHE_VARIABLES)
+      string (REGEX MATCHALL "(^|;)3RDPARTY_[^;]+_LIBRARY[^;]*" ALL_CACHE_VARIABLES "${ALL_CACHE_VARIABLES}")
+      set (DEBUG_DIR "")
+      set (RELEASE_DIR "")
+      foreach (CACHE_VARIABLE ${ALL_CACHE_VARIABLES})
+        set (CURRENT_CACHE_LIBRARY ${${CACHE_VARIABLE}})
+        string (TOLOWER "${CACHE_VARIABLE}" CACHE_VARIABLE)
+        if (NOT EXISTS "${CURRENT_CACHE_LIBRARY}" OR IS_DIRECTORY "${CURRENT_CACHE_LIBRARY}")
+          continue()
+        endif()
+        string (REGEX MATCH "_${CSF_LIBRARY}$" IS_ENDING "${CACHE_VARIABLE}")
+        string (REGEX MATCH "^([a-z]+)" CSF_WO_VERSION "${CSF_LIBRARY}")
+        string (REGEX MATCH "_${CSF_WO_VERSION}$" IS_ENDING_WO_VERSION "${CACHE_VARIABLE}")
+
+        if ("3rdparty_${CSF_LIBRARY}_library" STREQUAL "${CACHE_VARIABLE}" OR
+            "3rdparty_${CSF_WO_VERSION}_library" STREQUAL "${CACHE_VARIABLE}" OR
+            NOT "x${IS_ENDING}" STREQUAL "x" OR
+            NOT "x${IS_ENDING_WO_VERSION}" STREQUAL "x")
+          get_filename_component(LIBRARY_NAME "${CURRENT_CACHE_LIBRARY}" NAME)
+          list (APPEND FOUND_LIBS "${LIBRARY_NAME}")
+          get_filename_component(LIBRARY_DIR "${CURRENT_CACHE_LIBRARY}" DIRECTORY)
+          set (RELEASE_DIR "${LIBRARY_DIR}")
+          set (LIBRARY_FROM_CACHE 1)
+        elseif ("3rdparty_${CSF_LIBRARY}_library_debug" STREQUAL "${CACHE_VARIABLE}" OR
+                "3rdparty_${CSF_LIBRARY}_debug_library" STREQUAL "${CACHE_VARIABLE}")
+          get_filename_component(LIBRARY_NAME "${CURRENT_CACHE_LIBRARY}" NAME)
+          list (APPEND FOUND_LIBS "${LIBRARY_NAME}")
+          get_filename_component(LIBRARY_DIR "${CURRENT_CACHE_LIBRARY}" DIRECTORY)
+          set (DEBUG_DIR "${LIBRARY_DIR}")
+          set (LIBRARY_FROM_CACHE 1)
+        endif()
+
+        if (DEBUG_DIR AND RELEASE_DIR)
+          break()
+        endif()
+      endforeach()
+      if (NOT ${LIBRARY_FROM_CACHE} AND NOT "${CSF_LIBRARY}" STREQUAL "")
+        list (APPEND FOUND_LIBS "${CSF_LIBRARY_ORIGINAL}")
+        continue()
+      endif()
+      if (DEBUG_DIR AND RELEASE_DIR)
+        list (APPEND FOUND_DEBUG_DIRS "${DEBUG_DIR}")
+        list (APPEND FOUND_RELEASE_DIRS "${RELEASE_DIR}")
+      elseif (DEBUG_DIR)
+        list (APPEND FOUND_DEBUG_DIRS "${DEBUG_DIR}")
+        list (APPEND FOUND_RELEASE_DIRS "${DEBUG_DIR}")
+        message (WARNING "Debug directory found but no release directory found. Using debug directory for both configurations.")
+      elseif (RELEASE_DIR)
+        list (APPEND FOUND_DEBUG_DIRS "${RELEASE_DIR}")
+        list (APPEND FOUND_RELEASE_DIRS "${RELEASE_DIR}")
+      endif()
+    endforeach()
+
+    # Cache the result
+    set_property(GLOBAL PROPERTY "CACHED_LIBS_${CACHE_KEY}" "${FOUND_LIBS}")
+    set_property(GLOBAL PROPERTY "CACHED_DEBUG_DIRS_${CACHE_KEY}" "${FOUND_DEBUG_DIRS}")
+    set_property(GLOBAL PROPERTY "CACHED_RELEASE_DIRS_${CACHE_KEY}" "${FOUND_RELEASE_DIRS}")
+  endif()
+
+  # Append found values to the external variable
+  list(APPEND ${LIST_NAME} ${FOUND_LIBS})
+  set(${LIST_NAME} "${${LIST_NAME}}" PARENT_SCOPE)
+
+  # Handle library directories for different build configurations
+  list (REMOVE_DUPLICATES FOUND_RELEASE_DIRS)
+  list (REMOVE_DUPLICATES FOUND_DEBUG_DIRS)
+
+  foreach (RELEASE_DIR ${FOUND_RELEASE_DIRS})
+    get_filename_component(RELEASE_DIR_ABS "${RELEASE_DIR}" ABSOLUTE)
+    target_link_directories(${TARGET_NAME} PRIVATE "$<$<CONFIG:RELEASE>:${RELEASE_DIR_ABS}>;$<$<CONFIG:RELWITHDEBINFO>:${RELEASE_DIR_ABS}>")
+  endforeach()
+
+  foreach (DEBUG_DIR ${FOUND_DEBUG_DIRS})
+    get_filename_component(DEBUG_DIR_ABS "${DEBUG_DIR}" ABSOLUTE)
+    target_link_directories(${TARGET_NAME} PRIVATE "$<$<CONFIG:DEBUG>:${DEBUG_DIR_ABS}>")
+  endforeach()
+endfunction()
+macro(OCCT_ADD_VCPKG_FEATURE THE_FEATURE)
+  if (BUILD_USE_VCPKG)
+    list(APPEND VCPKG_MANIFEST_FEATURES "${THE_FEATURE}" PARENT_SCOPE)
+  endif()
+endmacro()
+
+macro (OCCT_UNSET_VCPKG_FEATURE THE_FEATURE)
+  if (BUILD_USE_VCPKG)
+    list (REMOVE_ITEM VCPKG_MANIFEST_FEATURES "${THE_FEATURE}" PARENT_SCOPE)
+  endif()
+endmacro()

adm/cmake/occt_toolkit.cmake

@@ -56,10 +56,6 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
     set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
   endif()
 
-  if (WIN32)
-    list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE_NAME}_DLL")
-  endif()
-
   set (SOURCE_FILES)
   set (HEADER_FILES)
 
@@ -67,13 +63,13 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
 
   set (HEADER_FILES_FILTERING ${ALL_FILES})
   set (SOURCE_FILES_FILTERING ${ALL_FILES})
-  
-  list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|lxx|gxx)")
-  
+
+  list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|p|g|lxx|hxx|pxx|hpp|gxx)$")
+    
   if(APPLE)
-    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|mm)")
+    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|cxx|cpp|mm)$")
   else()
-    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c)")
+    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|cpp|cxx)$")
   endif()
 
   list (APPEND HEADER_FILES ${HEADER_FILES_FILTERING})
@@ -100,12 +96,7 @@ string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
 set (USED_RCFILE "")
 if (MSVC)
   set (USED_RCFILE "${CMAKE_BINARY_DIR}/resources/${PROJECT_NAME}.rc")
-
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in")
-    configure_file("${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
-  else()
-    configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
-  endif()
+  configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
 endif()
 
 set (CURRENT_MODULE)
@@ -138,7 +129,7 @@ if (EXECUTABLE_PROJECT)
 else()
   add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
 
-  if (MSVC)
+  if (MSVC AND BUILD_SHARED_LIBS)
     if (BUILD_FORCE_RelWithDebInfo)
       set (aReleasePdbConf "Release")
     else()
@@ -247,36 +238,7 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
   if ("${CURRENT_CSF}" STREQUAL "${CSF_OpenGlesLibs}")
     add_definitions (-DHAVE_GLES2)
   endif()
-  set (LIBRARY_FROM_CACHE 0)
-  separate_arguments (CURRENT_CSF)
-  foreach (CSF_LIBRARY ${CURRENT_CSF})
-    string (TOLOWER "${CSF_LIBRARY}" CSF_LIBRARY)
-    string (REPLACE "+" "[+]" CSF_LIBRARY "${CSF_LIBRARY}")
-    string (REPLACE "." "" CSF_LIBRARY "${CSF_LIBRARY}")
-    get_cmake_property(ALL_CACHE_VARIABLES CACHE_VARIABLES)
-    string (REGEX MATCHALL "(^|;)3RDPARTY_[^;]+_LIBRARY[^;]*" ALL_CACHE_VARIABLES "${ALL_CACHE_VARIABLES}")
-    foreach (CACHE_VARIABLE ${ALL_CACHE_VARIABLES})
-      set (CURRENT_CACHE_LIBRARY ${${CACHE_VARIABLE}})
-      string (TOLOWER "${CACHE_VARIABLE}" CACHE_VARIABLE)
-      if (EXISTS "${CURRENT_CACHE_LIBRARY}" AND NOT IS_DIRECTORY "${CURRENT_CACHE_LIBRARY}")
-        string (REGEX MATCH "_${CSF_LIBRARY}$" IS_ENDING "${CACHE_VARIABLE}")
-        string (REGEX MATCH "^([a-z]+)" CSF_WO_VERSION "${CSF_LIBRARY}")
-        string (REGEX MATCH "_${CSF_WO_VERSION}$" IS_ENDING_WO_VERSION "${CACHE_VARIABLE}")
-        if ("3rdparty_${CSF_LIBRARY}_library" STREQUAL "${CACHE_VARIABLE}" OR
-            "3rdparty_${CSF_WO_VERSION}_library" STREQUAL "${CACHE_VARIABLE}" OR
-            NOT "x${IS_ENDING}" STREQUAL "x" OR
-            NOT "x${IS_ENDING_WO_VERSION}" STREQUAL "x")
-          list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT "${CURRENT_CACHE_LIBRARY}")
-          set (LIBRARY_FROM_CACHE 1)
-        endif()
-      endif()
-    endforeach()
-  endforeach()
-  if (NOT ${LIBRARY_FROM_CACHE} AND NOT "${CURRENT_CSF}" STREQUAL "")
-    # prepare a list from a string with whitespaces
-    separate_arguments (CURRENT_CSF)
-    list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
-  endif()
+  PROCESS_CSF_LIBRARIES ("${CURRENT_CSF}" USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT "${PROJECT_NAME}")
 endforeach()
 
 if (APPLE)
@@ -314,19 +276,18 @@ else()
   endif()
 endif()
 
-if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
-  if(IS_VTK_9XX)
-    string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
-  endif()
+if(IS_VTK_9XX)
+  string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
 endif()
-target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
+
+target_link_libraries (${PROJECT_NAME} PUBLIC ${USED_TOOLKITS_BY_CURRENT_PROJECT} PRIVATE ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
 
 if (USE_QT)
   foreach (PROJECT_LIBRARY_DEBUG ${PROJECT_LIBRARIES_DEBUG})
-    target_link_libraries (${PROJECT_NAME} debug ${PROJECT_LIBRARY_DEBUG})
+    target_link_libraries (${PROJECT_NAME} PRIVATE debug ${PROJECT_LIBRARY_DEBUG})
   endforeach()
   foreach (PROJECT_LIBRARY_RELEASE ${PROJECT_LIBRARIES_RELEASE})
-    target_link_libraries (${PROJECT_NAME} optimized ${PROJECT_LIBRARY_RELEASE})
+    target_link_libraries (${PROJECT_NAME} PRIVATE optimized ${PROJECT_LIBRARY_RELEASE})
   endforeach()
 endif()
 

adm/cmake/openvr.cmake

@@ -2,4 +2,17 @@
 # OpenVR is an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
 # https://github.com/ValveSoftware/openvr
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  set (USED_3RDPARTY_OPENVR_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+  find_library (FIND_OPENVR_LIB NAMES "${CSF_OpenVR}"
+                PATHS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib"
+                CMAKE_FIND_ROOT_PATH_BOTH
+                NO_DEFAULT_PATH)
+  set (CSF_OpenVR "${FIND_OPENVR_LIB}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/")
+  return()
+endif()
+
 THIRDPARTY_PRODUCT("OPENVR" "openvr.h" "CSF_OpenVR" "")

adm/cmake/qt.cmake

@@ -3,38 +3,54 @@
 # Qt is searched manually first (just determine root)
 message (STATUS "Processing Qt 3-rd party")
 
+set (USE_QT_FROM_3RDPARTY_DIR TRUE)
 if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
   FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
 
   if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
     set (3RDPARTY_QT_DIR "" CACHE PATH "The directory containing qt")
-    message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR")
+    set (USE_QT_FROM_3RDPARTY_DIR FALSE)
+  else()
+    # Combine directory name with absolute path and show in GUI
+    set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
   endif()
-
-  # Combine directory name with absolute path and show in GUI
-  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
-  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
 endif()
 
-set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
-
-# Now set CMAKE_PREFIX_PATH to point to local Qt installation.
-# Without this setting find_package() will not work
-set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
-
-# Now we can apply standard CMake finder for Qt5. We do this mostly
-# to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
-find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
+if (${USE_QT_FROM_3RDPARTY_DIR})
+  # Now set CMAKE_PREFIX_PATH to point to local Qt installation.
+  # Without this setting find_package() will not work
+  set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
+  
+  # Now we can apply standard CMake finder for Qt5. We do this mostly
+  # to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
+  find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
+else()
+  find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml)
+endif()
 if (NOT ${Qt5_FOUND})
   # Now we can apply standard CMake finder for Qt. We do this mostly
   # to have qt4_wrap_cpp() function available
   find_package(Qt4)
-  #message (STATUS "Qt4 cmake configuration")
-else()
-  #message (STATUS "Qt5 cmake configuration")
+elseif(NOT ${USE_QT_FROM_3RDPARTY_DIR} AND WIN32)
+  # Qt5_DIR typically points to lib/cmake/Qt5, need to go up to Qt root
+  get_filename_component(QT_CMAKE_DIR "${Qt5_DIR}" DIRECTORY)
+  get_filename_component(QT_LIB_DIR "${QT_CMAKE_DIR}" DIRECTORY)
+  get_filename_component(QT_ROOT_DIR "${QT_LIB_DIR}" DIRECTORY)
+  
+  # Verify this is indeed the Qt root by checking for bin and packages directories
+  if(EXISTS "${QT_ROOT_DIR}/bin")
+    set(3RDPARTY_QT_DIR ${QT_ROOT_DIR} CACHE PATH "The directory containing Qt" FORCE)
+  else()
+    message(WARNING "Found Qt5 at ${Qt5_DIR} but could not determine Qt root directory with bin/ and plugins/ folders")
+    set(3RDPARTY_QT_DIR ${Qt5_DIR} CACHE PATH "The directory containing Qt" FORCE)
+  endif()
+elseif(NOT ${USE_QT_FROM_3RDPARTY_DIR})
+  set(3RDPARTY_QT_DIR ${Qt5_DIR} CACHE PATH "The directory containing Qt" FORCE)
 endif()
 
-if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}")
+set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
+
+if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}/bin")
   list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
 else()
   list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR)

adm/cmake/rapidjson.cmake

@@ -1,5 +1,13 @@
 # RapidJSON
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package(RapidJSON CONFIG REQUIRED)
+  set(CSF_RapidJSON rapidjson)
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/rapidjson")
+  return()
+endif()
+
 if (NOT DEFINED INSTALL_RAPIDJSON)
   set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
 endif()

adm/cmake/tbb.cmake

@@ -1,5 +1,18 @@
 # tbb
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package(TBB CONFIG REQUIRED)
+  set(CSF_TBB TBB::tbb TBB::tbbmalloc)
+  if (WIN32)
+    set (USED_3RDPARTY_TBB_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_TBB_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/tbb")
+  return()
+endif()
+
 if (MSVC AND BUILD_SHARED_LIBS)
   add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
   add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
@@ -58,7 +71,12 @@ if (WIN32)
 
     # Get installed configuration of tbb
     get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
-    list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+    # Prioritize RELEASE configuration if available
+    if (";${TARGET_TBB_IMPORT_CONFS};" MATCHES ";RELEASE;")
+      set (CHOSEN_IMPORT_CONF "RELEASE")
+    else()
+      list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+    endif()
 
     separate_arguments (CSF_TBB)
     foreach (LIB IN LISTS CSF_TBB)
@@ -191,7 +209,12 @@ else ()
 
   # Get installed configuration of tbb
   get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
-  list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+  # Prioritize RELEASE configuration if available
+  if (";${TARGET_TBB_IMPORT_CONFS};" MATCHES ";RELEASE;")
+    set (CHOSEN_IMPORT_CONF "RELEASE")
+  else()
+    list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+  endif()
 
   separate_arguments (CSF_TBB)
   foreach (LIB IN LISTS CSF_TBB)

adm/cmake/tcl.cmake

@@ -1,6 +1,6 @@
 # tcl
 
-if (NOT DEFINED INSTALL_TCL)
+if (NOT DEFINED INSTALL_TCL AND NOT BUILD_USE_VCPKG)
   set (INSTALL_TCL OFF CACHE BOOL "${INSTALL_TCL_DESCR}")
 endif()
 
@@ -14,6 +14,10 @@ if (NOT DEFINED 3RDPARTY_TCL_INCLUDE_DIR)
   set (3RDPARTY_TCL_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tcl")
 endif()
 
+if (BUILD_USE_VCPKG)
+  set (3RDPARTY_TCL_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tcl" FORCE)
+  set (3RDPARTY_TCL_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" CACHE FILEPATH "The directory containing headers of tcl" FORCE)
+endif()
 
 # tcl library file (with absolute path)
 if (NOT DEFINED 3RDPARTY_TCL_LIBRARY OR NOT 3RDPARTY_TCL_LIBRARY_DIR)

adm/cmake/tk.cmake

@@ -18,6 +18,12 @@ if (NOT DEFINED 3RDPARTY_TK_INCLUDE_DIR)
   set (3RDPARTY_TK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tk")
 endif()
 
+# if (BUILD_USE_VCPKG)
+#   set (3RDPARTY_TK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tk" FORCE)
+#   set (3RDPARTY_TCLTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tcltk" FORCE)
+#   set (3RDPARTY_TK_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" CACHE FILEPATH "The directory containing headers of tk" FORCE)
+# endif()
+
 if (BUILD_SHARED_LIBS)
   # tk library file (with absolute path)
   if (NOT DEFINED 3RDPARTY_TK_LIBRARY OR NOT 3RDPARTY_TK_LIBRARY_DIR)
@@ -190,7 +196,8 @@ if (BUILD_SHARED_LIBS)
   if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
     list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
   else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TK_LIBRARY_DIR)
+    set (USE_TK OFF)
+    message(STATUS "Warning: TK library is not found. TK will be disabled.")
   endif()
 
   if (WIN32)

adm/cmake/vardescr.cmake

@@ -1,13 +1,5 @@
 # variable description
 
-# 
-set (BUILD_PATCH_DESCR 
-"Points to the directory recognized as a 'patch' for OCCT. If specified,
-the files from this directory take precedence over the corresponding native
-OCCT sources. This way you are able to introduce patches to Open CASCADE
-Technology not affecting the original source distribution")
-
-
 set (BUILD_LIBRARY_TYPE_DESCR 
 "Specifies the type of library to be created. 'Shared' libraries
 are linked dynamically and loaded at runtime. 'Static' libraries

adm/cmake/version.cmake

@@ -0,0 +1,21 @@
+#======================================================================
+#
+# Purpose:   Defines macros identifying current version of Open CASCADE
+#
+#  OCC_VERSION_MAJOR       : (integer) number identifying major version
+#  OCC_VERSION_MINOR       : (integer) number identifying minor version
+#  OCC_VERSION_MAINTENANCE : (integer) number identifying maintenance version
+#  OCC_VERSION_DEVELOPMENT : (string)  if defined, indicates development or modified version
+#                              in case of release, remove the value
+#
+#  Sample values of OCC_VERSION_DEVELOPMENT:
+#  - "dev" for development version between releases
+#  - "beta..." or "rc..." for beta releases or release candidates
+#  - "project..." for version containing project-specific fixes
+#
+#  For development version git commit hash can be added to the version string
+#======================================================================
+
+set (OCC_VERSION_MAJOR 7 )
+set (OCC_VERSION_MINOR 9 )
+set (OCC_VERSION_MAINTENANCE 1 )

adm/cmake/vtk.cmake

@@ -1,5 +1,31 @@
 # vtk
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package(VTK REQUIRED
+    COMPONENTS
+      CommonCore
+      RenderingUI
+      RenderingOpenGL2
+    OPTIONAL_COMPONENTS
+      mpi
+      utf8
+      eigen
+      doubleconversion
+      lz4
+      lzma
+      expat
+  )
+  set(IS_VTK_9XX 1)
+  if (WIN32)
+    set (USED_3RDPARTY_VTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_VTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+  return()
+endif()
+
 if (NOT DEFINED INSTALL_VTK)
   set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
 endif()
@@ -12,7 +38,7 @@ endif()
 # include occt macros. compiler_bitness, os_wiht_bit, compiler
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
-# specify VTK folder in connectin with 3RDPARTY_DIR
+# specify VTK folder in connection with 3RDPARTY_DIR
 if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
   #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_VTK_DIR PATH "The directory containing VTK")
 
@@ -60,7 +86,20 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
   set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
 endif()
 
-find_package(VTK QUIET)
+find_package(VTK QUIET
+  COMPONENTS
+    CommonCore
+    RenderingUI
+    RenderingOpenGL2
+  OPTIONAL_COMPONENTS
+    mpi
+    utf8
+    eigen
+    doubleconversion
+    lz4
+    lzma
+    expat
+)
 
 if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
   set (ENV{VTK_DIR} ${CACHED_VTK_DIR})

adm/gendoc

@@ -10,9 +10,9 @@ anOldDyLd="$DYLD_LIBRARY_PATH"
 
 # go to the script directory
 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-if [ -e "${aScriptPath}/env.sh" ]; then source "${aScriptPath}/env.sh"; fi
+if [ -e "${aScriptPath}/../env.sh" ]; then source "${aScriptPath}/../env.sh"; fi
 
-tclsh "${aScriptPath}/adm/start.tcl" gendoc $anArgs
+tclsh "${aScriptPath}/start.tcl" gendoc $anArgs
 
 export PATH="$anOldPath"
 export LD_LIBRARY_PATH="$anOldLd"

adm/gendoc.bat

@@ -6,8 +6,8 @@ rem should be in the PATH
 
 SET "OLD_PATH=%PATH%"
 
-if exist "%~dp0env.bat" (
-  call "%~dp0env.bat"
+if exist "%~dp0../env.bat" (
+  call "%~dp0../env.bat"
 )
 
 set "TCL_EXEC=tclsh.exe"
@@ -15,7 +15,7 @@ set "TCL_EXEC=tclsh.exe"
 for %%X in (%TCL_EXEC%) do (set TCL_FOUND=%%~$PATH:X)
 
 if defined TCL_FOUND (
-  %TCL_EXEC% %~dp0adm/start.tcl gendoc %*
+  %TCL_EXEC% %~dp0start.tcl gendoc %*
 ) else (
   echo "Error. %TCL_EXEC% is not found. Please update PATH variable"
 )

adm/gendoc.tcl

@@ -784,7 +784,7 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod
     puts $doxyFile "PROJECT_NUMBER         = $occt_version"
     puts $doxyFile "OUTPUT_DIRECTORY       = $outDir/."
     puts $doxyFile "GENERATE_TAGFILE       = $outDir/${name}.tag"
-
+    set searchMode "local"
     if { [string tolower $searchMode] == "none" } {
       puts $doxyFile "SEARCHENGINE           = NO"
       puts $doxyFile "SERVER_BASED_SEARCH    = NO"
@@ -865,6 +865,7 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod
           puts $doxyFile "TAGFILES               = $tagFileDir/OCCT.tag=../../refman/html"
         }
       }
+      set searchMode "local"
       # HTML Search engine options
       if { [string tolower $searchMode] == "none" } {
         puts $doxyFile "SEARCHENGINE           = NO"

adm/occaux.tcl

@@ -142,19 +142,41 @@ proc OCCDoc_GetRelPath {thePathFrom thePathTo} {
   return $thePathTo
 }
 
-# Returns OCCT version string from file Standard_Version.hxx (if available)
+# Returns OCCT version string from version.cmake (if available)
 proc OCCDoc_DetectCasVersion {} {
-  set occt_ver 6.7.0
+  # Default version in case the file is not found or readable
+  set occt_ver "7.8.0"
   set occt_ver_add ""
-  set filename "[OCCDoc_GetSourceDir]/Standard/Standard_Version.hxx"
-  if { [file exists $filename] } {
-    set fh [open $filename "r"]
-    set fh_loaded [read $fh]
-    close $fh
-    regexp {[^/]\s*#\s*define\s+OCC_VERSION_COMPLETE\s+\"([^\s]*)\"} $fh_loaded dummy occt_ver
-    regexp {[^/]\s*#\s*define\s+OCC_VERSION_DEVELOPMENT\s+\"([^\s]*)\"} $fh_loaded dummy occt_ver_add
-    if { "$occt_ver_add" != "" } { set occt_ver ${occt_ver}.$occt_ver_add }
+  
+  # Construct path to version.cmake relative to script location
+  set filename "[file normalize [file dirname [info script]]/cmake/version.cmake]"
+  
+  if { [file exists $filename] && [file readable $filename] } {
+    if {[catch {
+      set fh [open $filename "r"]
+      set fh_loaded [read $fh]
+      close $fh
+      
+      # Use more robust regular expressions
+      regexp {OCC_VERSION_MAJOR\s+(\d+)} $fh_loaded -> major
+      regexp {OCC_VERSION_MINOR\s+(\d+)} $fh_loaded -> minor
+      regexp {OCC_VERSION_MAINTENANCE\s+(\d+)} $fh_loaded -> maint
+      regexp {OCC_VERSION_DEVELOPMENT\s+\"([^\"]+)\"} $fh_loaded -> occt_ver_add
+      
+      if {[info exists major] && [info exists minor] && [info exists maint]} {
+        puts "Info: Open CASCADE Technology version $major.$minor.$maint"
+        set occt_ver "$major.$minor.$maint"
+        if { [info exists occt_ver_add] && $occt_ver_add != "" } {
+          set occt_ver ${occt_ver}.$occt_ver_add
+        }
+      }
+    } err]} {
+      puts "Warning: Error reading version from $filename: $err"
+    }
+  } else {
+    puts "Warning: Version file $filename not found or not readable"
   }
+  
   return $occt_ver
 }
 

adm/qmake/.gitignore

@@ -1,5 +0,0 @@
-/*/*.pro
-/*/*/*.pro
-*.pro.user
-custom.pri
-custom.auto.pri

adm/qmake/OccCppConfig.pri

@@ -1,165 +0,0 @@
-# This is project defines C++ compilation rules for building an OCCT Toolkit.
-
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-# Disable some dummy Qt defaults
-QT -= core gui
-CONFIG -= qt app_bundle
-CONFIG -= qml_debug
-CONFIG -= debug_and_release
-
-OccGitRoot = $$_PRO_FILE_PWD_/../../../..
-
-# Define compilation flags
-CONFIG += warn_on
-QMAKE_CFLAGS_WARN_ON   = -Wall -Wextra
-QMAKE_CXXFLAGS_WARN_ON = -Wall -Wextra
-win32 {
-  QMAKE_CFLAGS_WARN_ON   = -W4
-  QMAKE_CXXFLAGS_WARN_ON = -W4
-  QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
-  QMAKE_CXXFLAGS_STL_ON = /EHa
-
-  QMAKE_CXXFLAGS += -fp:precise
-  #QMAKE_CXXFLAGS -= -Zc:throwingNew
-  #QMAKE_CXXFLAGS -= -Zc:rvalueCast
-
-  QMAKE_LFLAGS += -INCREMENTAL:NO
-
-  CONFIG(debug, debug|release) {
-    QMAKE_CXXFLAGS += -Od
-    QMAKE_CXXFLAGS += -Ob1
-  }
-
-  DEFINES -= WIN32
-  DEFINES -= WIN64
-  DEFINES += _CRT_SECURE_NO_WARNINGS
-  DEFINES += _CRT_NONSTDC_NO_DEPRECATE
-  DEFINES += _SCL_SECURE_NO_WARNINGS
-} else {
-  CONFIG += c++11
-  clang {
-    QMAKE_CFLAGS_WARN_ON   += -Wshorten-64-to-32
-    QMAKE_CXXFLAGS_WARN_ON += -Wshorten-64-to-32
-  }
-  QMAKE_CFLAGS   += -fexceptions
-  QMAKE_CXXFLAGS += -fexceptions
-  QMAKE_CXXFLAGS += -fvisibility=default
-  DEFINES += OCC_CONVERT_SIGNALS
-  mac {
-    iphoneos {
-      QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
-    } else {
-      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
-    }
-  } else:gcc {
-    # ask linker to report missing library dependencies
-    QMAKE_LFLAGS += -Wl,-z,defs
-  }
-}
-!CONFIG(debug, debug|release) {
-  # disable exceptions in Release builds
-  DEFINES += No_Exception
-  HAVE_RelWithDebInfo {
-    win32 {
-      CONFIG += force_debug_info
-    }
-  }
-}
-
-# Define output folder depending on compiler name
-MY_BITNESS = 32
-
-equals(QMAKE_TARGET.arch, x86_64) | equals(QMAKE_HOST.arch, x86_64) { MY_BITNESS = 64 }
-equals(ANDROID_TARGET_ARCH, arm64-v8a) { MY_BITNESS = 64 }
-has64Target = $$find(QMAKE_TARGET.arch, "x64")
-count(has64Target, 1) { MY_BITNESS = 64 }
-
-MY_PLATFORM = platform
-CONFIG(iphonesimulator, iphoneos|iphonesimulator) { MY_PLATFORM = iphonesimulator
-} else:CONFIG(iphoneos, iphoneos|iphonesimulator) { MY_PLATFORM = iphoneos
-} else:android { MY_PLATFORM = android-$$ANDROID_TARGET_ARCH
-} else:win32   { MY_PLATFORM = win$$MY_BITNESS
-} else:mac     { MY_PLATFORM = mac
-} else:linux   { MY_PLATFORM = lin
-} else:unix    { MY_PLATFORM = unix
-} else { warning (Unknown platform. "$$MY_PLATFORM" is used) }
-
-MY_COMPILER = compiler
-MY_VC_VER = 0
-android-g++ {
-  MY_COMPILER = gcc
-} else:clang {
-  MY_COMPILER = clang
-} else:gcc {
-  MY_COMPILER = gcc
-} else:win32-msvc2010 {
-  MY_COMPILER = vc10
-  MY_VC_VER = 10
-} else:win32-msvc2012 {
-  MY_COMPILER = vc11
-  MY_VC_VER = 11
-} else:win32-msvc2013 {
-  MY_COMPILER = vc12
-  MY_VC_VER = 12
-} else:win32-msvc2015 {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-} else:win32-msvc2017 {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-} else:win32-msvc {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-  aMsvcVer = $$(VisualStudioVersion)
-  equals(aMsvcVer, 14.0){
-    # VS2015, vc140
-  } else:equals(aMsvcVer, 15.0){
-    # VS2015, vc141
-  } else:equals(aMsvcVer, 16.0){
-    # VS2019, vc142
-  } else:equals(aMsvcVer, 17.0){
-    # VS2022, vc143
-  } else {
-    warning (Unknown msvc version. "$$MY_COMPILER" is used)
-  }
-} else {
-  warning (Unknown compiler. "$$MY_COMPILER" is used)
-}
-MY_PLATFORM_AND_COMPILER = $$MY_PLATFORM/$$MY_COMPILER
-#warning (The platform is "$$MY_PLATFORM"; bitness is "$$MY_BITNESS"; compiler is "$$MY_COMPILER")
-
-CONFIG(debug, debug|release) { MY_BUILDTYPE = d }
-
-DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/lib$${MY_BUILDTYPE}
-win32 {
-  DESTDIR  = $$OccGitRoot/win$${MY_BITNESS}/vc$${MY_VC_VER}/bin$${MY_BUILDTYPE}
-  aLibDest = $$DESTDIR/../lib$${MY_BUILDTYPE}
-  #DLLDESTDIR = $$DESTDIR/../bin$${MY_BUILDTYPE}
-
-  # dummy target creating lib/libd folder
-  occtkgen_libfolder.input  = $$_PRO_FILE_PWD_/../../OcctDummy.in
-  occtkgen_libfolder.output = $$aLibDest/dummy.tmp
-  occtkgen_libfolder.config = verbatim
-  QMAKE_SUBSTITUTES += occtkgen_libfolder
-
-  LIBS += -L$$aLibDest
-  equals(TEMPLATE, lib) {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
-    QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
-    QMAKE_CLEAN += $$aLibDest/$${TARGET}.exp
-  } else {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.exe
-  }
-  QMAKE_CLEAN += $$DESTDIR/$${TARGET}.pdb
-  QMAKE_LFLAGS += -PDB:"$$DESTDIR/$${TARGET}.pdb"
-  QMAKE_LFLAGS += -IMPLIB:"$$aLibDest/$${TARGET}.lib"
-} else {
-  LIBS += -L$$DESTDIR
-  equals(TEMPLATE, app) {
-    DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/bin$${MY_BUILDTYPE}
-  }
-}
-
-OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}

adm/qmake/OccModule.pri

@@ -1,42 +0,0 @@
-# This is a project template file defining an OCCT Module.
-# This project should be included with predefined OCC_MODULE_NAME variable.
-TEMPLATE = subdirs
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-# Iterate over Toolkits within current Module and generate sub-project per Toolkit
-aModuleList = $$cat(../MODULES, lines)
-for (aModuleIter, aModuleList) {
-  #aTkList = $$list($$aModuleIter) - this doesn't work, qmake bug?
-  aModule = $$first($$list($$aModuleIter))
-  equals (aModule, $$OCC_MODULE_NAME) {
-    for (aToolKit, $$list($$aModuleIter)) {
-      toSkipToolkit = 0
-      equals (aToolKit, $$OCC_MODULE_NAME)      { toSkipToolkit = 1 }
-      !HAVE_VTK:equals (aToolKit, "TKIVtk")     { toSkipToolkit = 1 }
-      !HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
-      #!HAVE_OPENGL: equals (aToolKit, "TKOpenGl")       { toSkipToolkit = 1 }
-      #!HAVE_OPENGL: equals (aToolKit, "TKOpenGlTest")   { toSkipToolkit = 1 }
-      !HAVE_GLES2:   equals (aToolKit, "TKOpenGles")     { toSkipToolkit = 1 }
-      !HAVE_GLES2:   equals (aToolKit, "TKOpenGlesTest") { toSkipToolkit = 1 }
-      !win32:   equals (aToolKit, "TKD3DHost")  { toSkipToolkit = 1 }
-      !win32:   equals (aToolKit, "TKD3DHostTest") { toSkipToolkit = 1 }
-      equals (toSkipToolkit, 0) {
-
-        #warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
-        eval(occtkgen_$${aToolKit}.input  = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
-        eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)
-        eval(occtkgen_$${aToolKit}.config = verbatim)
-        eval(QMAKE_SUBSTITUTES += occtkgen_$${aToolKit})
-        SUBDIRS += $${aToolKit}
-
-        aModExtList = $$cat(../../src/$${aToolKit}/EXTERNLIB, lines)
-        aTkDepends = $${aToolKit}.depends
-        for (aModExtIter, aModExtList) {
-          contains ($$list($$aModuleIter), $$aModExtIter) { eval ($${aTkDepends} += $$aModExtIter) }
-        }
-        #warning($$aToolKit depends on: $$reverse($${aTkDepends}))
-      }
-    }
-  }
-}

adm/qmake/OccModule.pro.in

@@ -1,2 +0,0 @@
-OCC_MODULE_NAME = \$\$TARGET
-include(../OccModule.pri)

adm/qmake/OccToolkit.pri

@@ -1,166 +0,0 @@
-# This is a project template file defining an OCCT Toolkit.
-# This project should be included with predefined OCC_TOOLKIT_NAME variable.
-
-TEMPLATE = lib
-!exists(../../src/$$OCC_TOOLKIT_NAME/PACKAGES) {
-  TEMPLATE = app
-  CONFIG += console
-}
-win32 {
-  # do not append version to DLL name
-  CONFIG += skip_target_version_ext
-}
-
-include(OccCppConfig.pri)
-
-aSrcRoot = $$OccGitRoot/src
-aHxxRoot = $$OccGitRoot/inc
-INCLUDEPATH += $$aHxxRoot
-
-# CSF variables
-HAVE_FREETYPE  { CSF_FREETYPE = -lfreetype }
-CSF_TclLibs   = -ltcl8.6
-CSF_TclTkLibs = -ltk8.6
-HAVE_FREEIMAGE { CSF_FreeImagePlus = -lfreeimage } else:win32 { CSF_FreeImagePlus = -lwindowscodecs -lole32 }
-HAVE_FFMPEG    { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
-HAVE_TBB       { CSF_TBB = -ltbb -ltbbmalloc }
-HAVE_ZLIB      { CSF_ZLIB = -lzlib }
-HAVE_LIBLZMA   { CSF_LIBLZMA = -lliblzma }
-HAVE_DRACO     { CSF_Draco = -ldraco }
-win32 {
-  CSF_kernel32   = -lkernel32
-  CSF_advapi32   = -ladvapi32
-  CSF_gdi32      = -lgdi32
-  CSF_user32     = -luser32 -lcomdlg32
-  CSF_shell32    = -lShell32
-  CSF_opengl32   = -lopengl32
-  CSF_wsock32    = -lwsock32
-  CSF_netapi32   = -lnetapi32
-  CSF_OpenGlLibs = -lopengl32
-  CSF_OpenGlesLibs = -llibEGL -llibGLESv2
-  CSF_psapi      = -lPsapi
-  CSF_winmm      = -lwinmm
-  CSF_d3d9       = -ld3d9
-  CSF_TclLibs    = -ltcl86
-  CSF_TclTkLibs  = -ltk86
-  CSF_TBB =
-} else:mac {
-  CSF_dl         = -ldl
-  CSF_objc       = -lobjc
-  CSF_OpenGlLibs = -framework OpenGL
-  CSF_OpenGlesLibs = -framework OpenGLES
-  iphoneos {
-    CSF_Appkit     = -framework UIKit
-  } else {
-    CSF_Appkit     = -framework AppKit
-  }
-  CSF_IOKit      = -framework IOKit
-  CSF_TclLibs    = -framework Tcl
-  CSF_TclTkLibs  = -framework Tk
-} else {
-  CSF_dl = -ldl
-  CSF_ThreadLibs = -lpthread -lrt
-  CSF_OpenGlesLibs = -lEGL -lGLESv2
-  CSF_TclTkLibs  = -ltk8.6
-  HAVE_XLIB {
-    CSF_OpenGlLibs = -lGL
-    CSF_XwLibs     = -lX11
-  } else {
-    CSF_OpenGlLibs = -lGL -lEGL
-  }
-  HAVE_FREETYPE  { CSF_fontconfig = -lfontconfig }
-}
-
-for (aCfgIter, CONFIG) {
-  aRes = $$find(aCfgIter, "^HAVE_")
-  !equals(aCfgIter, "HAVE_GLES2") {
-    count(aRes, 1) {
-      DEFINES += $$aCfgIter
-    }
-  }
-}
-
-# Define the list of standard OCCT file extensions
-aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
-aPxxRegex = ^.*\.(pxx)$
-aCxxRegex = ^.*\.(cxx|cpp|c)$
-mac { aCxxRegex = ^.*\.(cxx|cpp|c|m|mm)$ }
-
-# Auxiliary function for probing file extension
-defineTest (occCheckExtension) {
-  aProbe = $$find(1, "$$2")
-  count(aProbe, 1) { return(true) } else { return(false) }
-}
-
-# Auxiliary function for probing compilable files
-defineTest (occIsCxxFile) { occCheckExtension ($$1, $$aCxxRegex) { return(true) } else { return(false) } }
-
-# Auxiliary function for probing header files
-defineTest (occIsHxxFile) { occCheckExtension ($$1, $$aHxxRegex) { return(true) } else { return(false) } }
-
-aTkFiles     = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/FILES,     lines)
-aTkFiles += CMakeLists.txt
-aPackages    = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/PACKAGES,  lines)
-anExternLibs = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/EXTERNLIB, lines)
-
-for (aTkFileIter, aTkFiles) { OTHER_FILES += $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aTkFileIter }
-for (anExternLib, anExternLibs) {
-  hasCsf = $$find(anExternLib, CSF_)
-  count(hasCsf, 1) {
-    aList = $$split($$anExternLib, "\n")
-    LIBS += $$aList
-    equals(anExternLib, "CSF_OpenGlLibs") {
-      DEFINES += "HAVE_OPENGL"
-    }
-    equals(anExternLib, "CSF_OpenGlesLibs") {
-      DEFINES += "HAVE_GLES2"
-    }
-  } else {
-    LIBS += -l$$anExternLib
-  }
-}
-
-# Iterate over Packages and add compilable files into this project
-isEmpty (aPackages) { aPackages = $$OCC_TOOLKIT_NAME }
-for (aPackage, aPackages) {
-  aPackageFolder = $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aPackage
-  aPackageFiles = $$cat($$aSrcRoot/$$aPackage/FILES, lines)
-  for (aFileIter, aPackageFiles) {
-    occIsCxxFile($$aFileIter) {
-      SOURCES += $$aSrcRoot/$$aPackage/$$aFileIter
-    }
-  }
-}
-
-!win32 {
-  aVerList = $$split(VERSION, ".")
-  aVerMaj = $$member(aVerList, 0)
-  aVerMin = $$member(aVerList, 1)
-  aVerMic = $$member(aVerList, 2)
-
-  equals(TEMPLATE, app) {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}
-  } else {
-    mac {
-      # override qmake soname versionong logic
-      QMAKE_LFLAGS_SONAME =
-      QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.dylib.$${aVerMaj}.$${aVerMin}
-
-      # extend clean with versioned .dylib files
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
-    } else {
-      # override qmake soname versionong logic
-      QMAKE_LFLAGS_SONAME =
-      QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
-
-      # extend clean with versioned .so files
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}.$${aVerMic}
-    }
-  }
-}

adm/qmake/OccToolkit.pro.in

@@ -1,2 +0,0 @@
-OCC_TOOLKIT_NAME = \$\$TARGET
-include(../../OccToolkit.pri)

adm/qmake/Occt.pro

@@ -1,45 +0,0 @@
-# This is an experimental Solution project for building entire OCCT framework using qmake.
-# It can be also used for just source code navigation in Qt Creator without actually building OCCT.
-# Note, as this is an experimental project, compiler flags might differ from official builds - use it on your own risk!
-# Building OCCT using CMake is a preferred solution.
-#
-# This project GENERATES sub-projects (OCCT modules) dynamically, so to start using it:
-# - Launch genconf, select Project Format "Qt Project" and configure dependencies; this will also generate "custom.auto.pri".
-# - Launch genproj to fill in "inc" folder with links to header files.
-# - Open project in Qt Creator, and call "Run qmake".
-# - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
-# - "Run qmake" and perform Build.
-#
-# Within Debian-based Linux repository Qt Creator can be installed like this:
-# > sudo apt-get install qtcreator qtbase5-dev
-
-TEMPLATE = subdirs
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-OTHER_FILES += OccModule.pro.in \
-               OcctHeaderLink.hxx.in \
-               OccToolkit.pro.in \
-               OccCppConfig.pri \
-               OccModule.pri \
-               OccToolkit.pri \
-               custom.pri.template
-
-# Iterate over Modules and generate sub-projects
-aSolModuleList = $$cat(../MODULES, lines)
-for (aSolModuleIter, aSolModuleList) {
-  aSolModule = $$first($$list($$aSolModuleIter))
-  eval(occtkgen_$${aSolModule}.input  = $$_PRO_FILE_PWD_/OccModule.pro.in)
-  eval(occtkgen_$${aSolModule}.output = $$_PRO_FILE_PWD_/$${aSolModule}/$${aSolModule}.pro)
-  eval(occtkgen_$${aSolModule}.config = verbatim)
-  eval(QMAKE_SUBSTITUTES += occtkgen_$${aSolModule})
-  SUBDIRS += $${aSolModule}
-}
-
-# These dependencies are manually defined
-ModelingData.depends = FoundationClasses
-ModelingAlgorithms.depends = FoundationClasses ModelingData
-Visualization.depends = FoundationClasses ModelingData ModelingAlgorithms
-ApplicationFramework.depends = FoundationClasses ModelingData ModelingAlgorithms Visualization
-DataExchange.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework
-Draw.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework DataExchange Visualization

adm/qmake/OcctHeaderLink.hxx.in

@@ -1 +0,0 @@
-#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"

adm/qmake/custom.pri.template

@@ -1,17 +0,0 @@
-PRODUCTS_PATH = c:/3rdparty/vc14
-
-#CONFIG += HAVE_FREEIMAGE
-#CONFIG += HAVE_FFMPEG
-#CONFIG += HAVE_TBB
-#CONFIG += HAVE_GLES2
-#CONFIG += HAVE_D3D
-#CONFIG += HAVE_VTK
-
-aFreeType = $$PRODUCTS_PATH/freetype-2.5.5-vc14-64
-aTclTk    = $$PRODUCTS_PATH/tcltk-86-64
-
-INCLUDEPATH += $$aFreeType/include
-LIBS        += -L$$aFreeType/lib
-
-INCLUDEPATH += $$aTclTk/include
-LIBS        += -L$$aTclTk/lib

adm/qmake/qtcreator-occt-cpp.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorCodeStyle>
-<!-- Written by QtCreator 3.6.1, 2016-05-19T14:46:43. -->
-<qtcreator>
- <data>
-  <variable>CodeStyleData</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="AlignAssignments">true</value>
-   <value type="bool" key="AutoSpacesForTabs">false</value>
-   <value type="bool" key="BindStarToIdentifier">false</value>
-   <value type="bool" key="BindStarToLeftSpecifier">true</value>
-   <value type="bool" key="BindStarToRightSpecifier">false</value>
-   <value type="bool" key="BindStarToTypeName">true</value>
-   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
-   <value type="bool" key="IndentAccessSpecifiers">false</value>
-   <value type="bool" key="IndentBlockBody">true</value>
-   <value type="bool" key="IndentBlockBraces">false</value>
-   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentClassBraces">false</value>
-   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
-   <value type="bool" key="IndentEnumBraces">false</value>
-   <value type="bool" key="IndentFunctionBody">true</value>
-   <value type="bool" key="IndentFunctionBraces">false</value>
-   <value type="bool" key="IndentNamespaceBody">true</value>
-   <value type="bool" key="IndentNamespaceBraces">false</value>
-   <value type="int" key="IndentSize">2</value>
-   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentSwitchLabels">true</value>
-   <value type="int" key="PaddingMode">2</value>
-   <value type="bool" key="SpacesForTabs">true</value>
-   <value type="int" key="TabSize">2</value>
-  </valuemap>
- </data>
- <data>
-  <variable>DisplayName</variable>
-  <value type="QString">occt</value>
- </data>
-</qtcreator>

adm/scripts/android_build.bat

@@ -67,8 +67,9 @@ if ["%toCMake%"] == ["1"] (
 set "anOcctVerSuffix="
 set "anOcctVersion=0.0.0"
 set "aGitBranch="
-for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_DEVELOPMENT" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVerSuffix=%%i" )
-for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_COMPLETE" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVersion=%%i" )
+rem Get OCCT version
+call "%~dp0build_common.bat"
+set "aGitBranch="
 for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
 
 for %%s in (%anNdkAbiList%) do (

adm/scripts/build_common.bat

@@ -0,0 +1,8 @@
+@echo OFF
+
+rem Extract version info from version.cmake
+for /f tokens^=2^ delims^=^" %%i in ('findstr OCC_VERSION_DEVELOPMENT "%~dp0\..\cmake\version.cmake"') do ( set "anOcctVerSuffix=%%i" )
+for /f tokens^=3 %%i in ('findstr OCC_VERSION_MAJOR "%~dp0\..\cmake\version.cmake"') do ( set "OCC_VERSION_MAJOR=%%i" )
+for /f tokens^=3 %%i in ('findstr OCC_VERSION_MINOR "%~dp0\..\cmake\version.cmake"') do ( set "OCC_VERSION_MINOR=%%i" )
+for /f tokens^=3 %%i in ('findstr OCC_VERSION_MAINTENANCE "%~dp0\..\cmake\version.cmake"') do ( set "OCC_VERSION_MAINTENANCE=%%i" )
+set "anOcctVersion=%OCC_VERSION_MAJOR%.%OCC_VERSION_MINOR%.%OCC_VERSION_MAINTENANCE%"

adm/scripts/build_common.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Ensure script dir is defined
+if [ -z "$aScriptDir" ]; then
+    aScriptDir=$(dirname "$0")
+fi
+
+# Check if version file exists
+versionFile="$aScriptDir/../cmake/version.cmake"
+if [ ! -f "$versionFile" ]; then
+    echo "Error: version.cmake not found"
+    exit 1
+fi
+
+# Extract version info from version.cmake
+OCC_VERSION_MAJOR=$(awk '/set.*OCC_VERSION_MAJOR/ {print $3}' "$versionFile")
+OCC_VERSION_MINOR=$(awk '/set.*OCC_VERSION_MINOR/ {print $3}' "$versionFile")
+OCC_VERSION_MAINTENANCE=$(awk '/set.*OCC_VERSION_MAINTENANCE/ {print $3}' "$versionFile")
+anOcctVerSuffix=$(awk '/set.*OCC_VERSION_DEVELOPMENT/ {
+    if (NF > 2) {
+        gsub(/[)" ]/, "", $3)
+        print $3
+    } else {
+        print ""
+    }
+}' "$versionFile")
+
+# Combine version string
+anOcctVersion="${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}"
+

adm/scripts/cmake_custom.bat.template

@@ -28,9 +28,6 @@ rem Use semicolon-separated list of toolkits if you want to disable all modules
 rem  and build only some toolkits.
 rem set BUILD_ADDITIONAL_TOOLKITS=
 
-rem Set a directory recognized as a patch for OCCT.
-rem set BUILD_PATCH=
-
 rem set BUILD_MODULE_ApplicationFramework=ON
 rem set BUILD_MODULE_DataExchange=ON
 rem set BUILD_MODULE_DETools=OFF

adm/scripts/cmake_custom.sh.template

@@ -21,9 +21,6 @@ FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
 #  and build only some toolkits.
 #BUILD_ADDITIONAL_TOOLKITS=
 
-# Set a directory recognized as a patch for OCCT.
-#BUILD_PATCH=
-
 #BUILD_MODULE_ApplicationFramework=ON
 #BUILD_MODULE_DataExchange=ON
 #BUILD_MODULE_DETools=OFF

adm/scripts/cmake_gen.bat

@@ -19,7 +19,6 @@ set BUILD_ADDITIONAL_TOOLKITS=
 set BUILD_DOC_Overview=OFF
 set BUILD_Inspector=OFF
 set BUILD_LIBRARY_TYPE=Shared
-set BUILD_PATCH=
 set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
 set BUILD_WITH_DEBUG=OFF
 set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
@@ -69,7 +68,6 @@ cmake -G "%arch_compile%" ^
   -D BUILD_MODULE_ModelingAlgorithms:BOOL=%BUILD_MODULE_ModelingAlgorithms% ^
   -D BUILD_MODULE_ModelingData:BOOL=%BUILD_MODULE_ModelingData% ^
   -D BUILD_MODULE_Visualization:BOOL=%BUILD_MODULE_Visualization% ^
-  -D BUILD_PATCH:PATH="%BUILD_PATCH%" ^
   -D BUILD_RELEASE_DISABLE_EXCEPTIONS:BOOL=%BUILD_RELEASE_DISABLE_EXCEPTIONS% ^
   -D BUILD_WITH_DEBUG:BOOL=%BUILD_WITH_DEBUG% ^
   -D BUILD_ENABLE_FPE_SIGNAL_HANDLER:BOOL=%BUILD_ENABLE_FPE_SIGNAL_HANDLER% ^

adm/scripts/cmake_gen.sh

@@ -24,7 +24,6 @@ BUILD_ADDITIONAL_TOOLKITS=
 BUILD_DOC_Overview=OFF
 BUILD_Inspector=OFF
 BUILD_LIBRARY_TYPE=Shared
-BUILD_PATCH=
 BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
 BUILD_WITH_DEBUG=OFF
 BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
@@ -70,7 +69,6 @@ cmake -G "Unix Makefiles" \
   -D BUILD_MODULE_ModelingAlgorithms:BOOL=$BUILD_MODULE_ModelingAlgorithms \
   -D BUILD_MODULE_ModelingData:BOOL=$BUILD_MODULE_ModelingData \
   -D BUILD_MODULE_Visualization:BOOL=$BUILD_MODULE_Visualization \
-  -D BUILD_PATCH:PATH="$BUILD_PATCH" \
   -D BUILD_RELEASE_DISABLE_EXCEPTIONS:BOOL=$BUILD_RELEASE_DISABLE_EXCEPTIONS \
   -D BUILD_WITH_DEBUG:BOOL=$BUILD_WITH_DEBUG \
   -D BUILD_ENABLE_FPE_SIGNAL_HANDLER:BOOL=$BUILD_ENABLE_FPE_SIGNAL_HANDLER \

adm/scripts/ios_build.sh

@@ -49,8 +49,7 @@ if [[ -f "${aScriptDir}/ios_custom.sh" ]]; then
   source "${aScriptDir}/ios_custom.sh"
 fi
 
-anOcctVerSuffix=`grep -e "#define OCC_VERSION_DEVELOPMENT" "$aCasSrc/src/Standard/Standard_Version.hxx" | awk '{print $3}' | xargs`
-anOcctVersion=`grep -e "#define OCC_VERSION_COMPLETE" "$aCasSrc/src/Standard/Standard_Version.hxx" | awk '{print $3}' | xargs`
+source "${aScriptDir}/build_common.sh"
 aGitBranch=`git symbolic-ref --short HEAD`
 
 YEAR=$(date +"%Y")

adm/scripts/macos_build.sh

@@ -51,8 +51,7 @@ if [[ -f "${aScriptDir}/macos_custom.sh" ]]; then
   source "${aScriptDir}/macos_custom.sh"
 fi
 
-anOcctVerSuffix=`grep -e "#define OCC_VERSION_DEVELOPMENT" "$aCasSrc/src/Standard/Standard_Version.hxx" | awk '{print $3}' | xargs`
-anOcctVersion=`grep -e "#define OCC_VERSION_COMPLETE" "$aCasSrc/src/Standard/Standard_Version.hxx" | awk '{print $3}' | xargs`
+source "${aScriptDir}/build_common.sh"
 aGitBranch=`git symbolic-ref --short HEAD`
 
 YEAR=$(date +"%Y")

adm/scripts/mingw_build.bat

@@ -53,9 +53,8 @@ if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" )
 
 set "anOcctVerSuffix="
 set "anOcctVersion=0.0.0"
+call "%~dp0build_common.bat"
 set "aGitBranch="
-for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_DEVELOPMENT" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVerSuffix=%%i" )
-for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_COMPLETE" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVersion=%%i" )
 for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
 
 set "aBuildType=Release"

adm/scripts/wasm_build.bat

@@ -55,8 +55,8 @@ if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" )
 set "anOcctVerSuffix="
 set "anOcctVersion=0.0.0"
 set "aGitBranch="
-for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_DEVELOPMENT" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVerSuffix=%%i" )
-for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_COMPLETE" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVersion=%%i" )
+call "%~dp0build_common.bat"
+set "aGitBranch="
 for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
 
 set "aBuildType=Release"

adm/templates/OpenCASCADEConfig.cmake.in

@@ -27,7 +27,7 @@ get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX
 if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
 endif()
-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib(32|64)?$")
   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
 endif()
 if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")