0033845: Configuration - Add possibility to specify debug version of 3rdparties

Add functionality seeking debug version of 3rdparty libraries.
If debug ones were not found, the release are used instead.
Use standard functionality to find draco.

.clang-format

@@ -1,41 +0,0 @@
-# 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

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

.github/ISSUE_TEMPLATE/Application Framework Bug Report.yaml

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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,92 +0,0 @@
-name: "Bug Report"
-description: "Report a bug related to the OCCT"
-labels: ["2. Bug", "0. New"]
-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
-      default: 0
-    validations:
-      required: true
-  - type: dropdown
-    id: compiler
-    attributes:
-      label: Compiler
-      description: "Select the compiler"
-      options:
-        - GCC
-        - Clang
-        - MSVC
-      default: 0
-    validations:
-      required: true
-  - type: dropdown
-    id: bitness
-    attributes:
-      label: Bitness
-      description: "Select the bitness"
-      options:
-        - 32-bit
-        - 64-bit
-      default: 1
-    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.7
-        - 7.8
-        - 7.9
-        - latest
-      default: 6
-    validations:
-      required: true
-  - 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 Bug Report.yaml

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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/DRAW Bug Report.yaml

@@ -0,0 +1,102 @@
+name: "DRAW Bug Report"
+description: "Report a bug related to DRAW"
+labels: ["1. 2. Bug", "DRAW"]
+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/DRAW Feature Request.yaml

@@ -0,0 +1,34 @@
+name: "DRAW Feature Request"
+description: "Request a new feature related to DRAW"
+labels: ["1. Enhancement", "DRAW"]
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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,34 +0,0 @@
-name: "Feature Request"
-description: "Request a new feature or enhancement for the OCCT"
-labels: ["2. Enhancement", "0. New"]
-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/Foundation Classes Bug Report.yaml

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,34 @@
+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/ascii-check/action.yml

@@ -1,95 +0,0 @@
-name: 'ASCII Code Check'
-description: 'Check for non-ASCII characters in changed code files'
-inputs:
-  base-ref:
-    description: 'Base reference to compare changes against'
-    required: true
-    default: 'master'
-  file-pattern:
-    description: 'Pattern to match files for ASCII check'
-    required: false
-    default: '^(src)/.*\.(cpp|hxx|cxx|lxx|h|pxx|hpp)$'
-
-outputs:
-  has-non-ascii:
-    description: 'Whether any files contained non-ASCII characters'
-    value: ${{ steps.ascii-check.outputs.has_non_ascii }}
-
-runs:
-  using: "composite"
-  steps:
-    - 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 }}' } |
-          Where-Object { Test-Path $_ }
-        
-        $changedFiles | Set-Content "changed_files.txt"
-        if ($changedFiles.Count -gt 0) {
-          echo "has_files=true" >> $env:GITHUB_OUTPUT
-        }
-
-    - name: Check for non-ASCII characters
-      id: ascii-check
-      if: steps.changed-files.outputs.has_files == 'true'
-      shell: pwsh
-      run: |
-        $hasNonAscii = $false
-        $nonAsciiLogs = @()
-        
-        $files = Get-Content "changed_files.txt" | Where-Object { Test-Path $_ }
-        foreach ($file in $files) {
-          Write-Output "Checking file: $file"
-          $fileContent = Get-Content -Path $file -Raw
-          $lineNumber = 1
-          $nonAsciiInFile = $false
-          
-          foreach ($line in ($fileContent -split "`n")) {
-            # Find non-ASCII characters (char code > 127)
-            $nonAsciiMatches = [regex]::Matches($line, "[^\x00-\x7F]")
-            if ($nonAsciiMatches.Count -gt 0) {
-              $nonAsciiInFile = $true
-              $hasNonAscii = $true
-              
-              foreach ($match in $nonAsciiMatches) {
-                $charCode = [int][char]$match.Value
-                $hexCode = "0x{0:X}" -f $charCode
-                $positionInLine = $match.Index + 1
-                
-                $message = "Non-ASCII character found in '$file' at line $lineNumber, position $($positionInLine): '$($match.Value)' (Unicode: $hexCode)"
-                $nonAsciiLogs += $message
-                Write-Output $message
-              }
-            }
-            $lineNumber++
-          }
-          
-          if ($nonAsciiInFile) {
-            Write-Output "::warning file=$file::File contains non-ASCII characters"
-          }
-        }
-        
-        $nonAsciiLogs | Set-Content "non_ascii_report.txt"
-        if ($hasNonAscii) {
-          echo "has_non_ascii=true" >> $env:GITHUB_OUTPUT
-        }
-
-    - name: Upload non-ASCII report
-      if: steps.ascii-check.outputs.has_non_ascii == 'true'
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: non-ascii-report
-        path: non_ascii_report.txt
-
-    - name: Failing step for non-ASCII issues
-      if: steps.ascii-check.outputs.has_non_ascii == 'true'
-      shell: pwsh
-      run: |
-        Write-Output "::error::Files contain non-ASCII characters. See the non-ascii-report artifact for details."
-        exit 1
-
-branding:
-  icon: 'alert-circle'
-  color: 'red'

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

@@ -1,61 +0,0 @@
-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: Configure OCCT
-      run: |
-          mkdir build
-          cd build
-          cmake -T host=x64 `
-                -D BUILD_USE_PCH=ON `
-                -D BUILD_OPT_PROFILE=Production `
-                -D BUILD_INCLUDE_SYMLINK=ON `
-                -D CMAKE_BUILD_TYPE=Release `
-                -D BUILD_DOC_Overview=ON `
-                -D BUILD_DOC_RefMan=ON `
-                -D BUILD_MODULE_Draw=OFF `
-                -D USE_D3D=OFF `
-                -D USE_DRACO=OFF `
-                -D USE_FFMPEG=OFF `
-                -D USE_FREEIMAGE=OFF `
-                -D USE_GLES2=OFF `
-                -D USE_OPENVR=OFF `
-                -D USE_VTK=OFF `
-                -D USE_TBB=OFF `
-                -D USE_RAPIDJSON=OFF `
-                -D USE_OPENGL=OFF `
-                -D USE_FREETYPE=OFF `
-                -D USE_TK=OFF `
-                -D USE_TCL=OFF `
-                -D CMAKE_CXX_FLAGS="/W4 /WX" `
-                -D CMAKE_C_FLAGS="/W4 /WX" ..
-      shell: pwsh
-
-    - name: Build documentation
-      run: |
-          set PATH=%PATH%;C:\Program Files\doxygen\bin;C:\Program Files\Graphviz\bin;C:\Program Files\doxygen
-          cd build
-          cmake --build . --target doc --config Release
-      shell: cmd
-
-    - name: Upload refman documentation
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: refman-doc
-        path: build/doc/refman
-        retention-days: 90
-
-    - name: Upload overview documentation
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: overview-doc
-        path: build/doc/overview
-        retention-days: 90

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

@@ -1,85 +0,0 @@
-name: 'Build OCCT'
-description: 'Prepare and build OCCT on a specific platform'
-
-inputs:
-  platform:
-    description: 'Platform (windows, macos, linux)'
-    required: true
-  compiler:
-    description: 'Compiler (msvc, clang, gcc)'
-    required: true
-  artifact-name:
-    description: 'Name of the artifact to store build results'
-    required: true
-  additional-cmake-flags:
-    description: 'Additional CMake flags'
-    required: false
-    default: ''
-  use-vtk:
-    description: 'Enable VTK'
-    required: false
-    default: 'true'
-  build-use-pch:
-    description: 'Enable precompiled headers'
-    required: false
-    default: 'true'
-  build-opt-profile:
-    description: 'Build optimization profile'
-    required: false
-    default: 'Production'
-  cmake-build-type:
-    description: 'CMake build type (Release, Debug, etc)'
-    required: false
-    default: 'Release'
-  github-token:
-    description: 'GitHub token for vcpkg NuGet package access'
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Configure OCCT
-      uses: ./.github/actions/configure-occt
-      with:
-        platform: ${{ inputs.platform }}
-        compiler: ${{ inputs.compiler }}
-        additional-cmake-flags: ${{ inputs.additional-cmake-flags }}
-        use-vtk: ${{ inputs.use-vtk }}
-        build-use-pch: ${{ inputs.build-use-pch }}
-        build-opt-profile: ${{ inputs.build-opt-profile }}
-        cmake-build-type: ${{ inputs.cmake-build-type }}
-        github-token: ${{ inputs.github-token }}
-
-    - name: Upload vcpkg cache
-      uses: ./.github/actions/upload-vcpkg-cache
-      with:
-        artifact-name: ${{ inputs.artifact-name }}-cache
-        build-directory: build
-
-    - name: Build OCCT (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      run: |
-          cd build
-          cmake --build . --target install --config Release
-      shell: pwsh
-
-    - name: Build OCCT (macOS)
-      if: ${{ inputs.platform == 'macos' }}
-      run: |
-        cd build
-        make install -j$(sysctl -n hw.logicalcpu)
-      shell: bash
-
-    - name: Build OCCT (Linux)
-      if: ${{ inputs.platform == 'linux' }}
-      run: |
-        cd build
-        cmake --build . --target install --config Release -- -j
-      shell: bash
-
-    - name: Upload install directory
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: ${{ inputs.artifact-name }}
-        path: install
-        retention-days: 7

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

@@ -1,57 +0,0 @@
-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.3.0
-      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.6.2
-      with:
-        name: csharp-sample-${{ inputs.platform }}-x64
-        path: samples/CSharp
-        retention-days: 7

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

@@ -1,54 +0,0 @@
-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.3.0
-      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.6.2
-      with:
-        name: mfc-sample-${{ inputs.platform }}-x64
-        path: samples/mfc/
-        retention-days: 7

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

@@ -1,125 +0,0 @@
-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.3.0
-      with:
-        name: ${{ inputs.install-artifact-name }}
-        path: occt-install
-
-    - name: Download vcpkg cache
-      uses: ./.github/actions/download-vcpkg-cache
-      with:
-        artifact-name: ${{ inputs.install-artifact-name }}-cache
-
-    - 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
-        
-        # Set library paths for vcpkg dependencies
-        export LD_LIBRARY_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib:${{ github.workspace }}/occt-install/lib:$LD_LIBRARY_PATH"
-        export LIBRARY_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib:${{ github.workspace }}/occt-install/lib:$LIBRARY_PATH"
-        export PKG_CONFIG_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib/pkgconfig:$PKG_CONFIG_PATH"
-        
-        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"
-          
-          # Configure qmake with vcpkg paths
-          qmake $sample.pro \
-            "LIBS += -L${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib" \
-            "LIBS += -Wl,-rpath,${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib" \
-            "INCLUDEPATH += ${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/include"
-          
-          aNbJobs="$(getconf _NPROCESSORS_ONLN)"
-          make -j$aNbJobs release
-          cd ..
-        done
-
-    - name: Upload Qt Samples
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: qt-samples-${{ inputs.platform }}-x64
-        path: |
-          samples/qt/
-          samples/qt/
-        retention-days: 7

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

@@ -1,109 +0,0 @@
-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.3.0
-      with:
-        name: ${{ inputs.install-artifact-name }}
-        path: occt-install
-
-    - name: Download vcpkg cache
-      uses: ./.github/actions/download-vcpkg-cache
-      with:
-        artifact-name: ${{ inputs.install-artifact-name }}-cache
-
-    - 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: Checkout TInspector
-      shell: bash
-      run: |
-        git clone https://github.com/Open-Cascade-SAS/Inspector.git inspector
-        cd inspector
-        git checkout 0757c9bbe4d856a9cd26a62a453fc31879d9d054
-
-    - name: Configure TInspector - Windows
-      if: inputs.platform == 'windows'
-      shell: pwsh
-      run: |
-        cd inspector
-        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 }}/inspector/install `
-              -D CMAKE_POLICY_VERSION_MINIMUM=3.5 `
-              ..
-
-    - name: Configure TInspector - Linux
-      if: inputs.platform == 'linux'
-      shell: bash
-      run: |
-        cd inspector
-        mkdir build
-        cd build
-        export LD_LIBRARY_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib:${{ github.workspace }}/occt-install/lib:$LD_LIBRARY_PATH"
-        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 }}/inspector/install \
-              -D CMAKE_POLICY_VERSION_MINIMUM=3.5 \
-              -D CMAKE_LIBRARY_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib" \
-              -D CMAKE_INCLUDE_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/include" \
-              -D CMAKE_EXE_LINKER_FLAGS="-L${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib -Wl,-rpath,${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib" \
-              -D CMAKE_SHARED_LINKER_FLAGS="-L${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib -Wl,-rpath,${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib" \
-              ..
-
-    - name: Build TInspector - Windows
-      if: inputs.platform == 'windows'
-      shell: pwsh
-      run: |
-        cd inspector/build
-        cmake --build . --config Release --target install
-
-    - name: Build TInspector - Linux
-      if: inputs.platform == 'linux'
-      shell: bash
-      run: |
-        cd inspector/build
-        # Set library paths for build and runtime
-        export LD_LIBRARY_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib:${{ github.workspace }}/occt-install/lib:$LD_LIBRARY_PATH"
-        export LIBRARY_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib:${{ github.workspace }}/occt-install/lib:$LIBRARY_PATH"
-        export PKG_CONFIG_PATH="${{ github.workspace }}/build/vcpkg_installed/x64-linux-dynamic/lib/pkgconfig:$PKG_CONFIG_PATH"
-        make install -j$(nproc)
-
-    - name: Upload TInspector installation
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: inspector-${{ inputs.platform }}-x64
-        path: inspector/install
-        retention-days: 7

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

@@ -1,85 +0,0 @@
-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)/.*\.(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 }}' } |
-          Where-Object { Test-Path $_ }
-        
-        $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" | Where-Object { Test-Path $_ }
-        $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.6.2
-      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/cmake-build-basic/action.yml

@@ -1,83 +0,0 @@
-name: 'CMake Basic Build'
-description: 'Configure and build OCCT with basic configuration'
-
-inputs:
-  generator:
-    description: 'CMake generator'
-    required: true
-    default: 'Ninja'
-  cc:
-    description: 'C compiler'
-    required: true
-  cxx:
-    description: 'C++ compiler'
-    required: true
-  build-type:
-    description: 'Build type (Debug, Release)'
-    required: false
-    default: 'Release'
-  compiler-flags:
-    description: 'Additional compiler flags'
-    required: false
-    default: ''
-  thirdparty-dir:
-    description: '3rd party directory'
-    required: false
-    default: ''
-  shell-type:
-    description: 'Shell type to use (powershell, msys2, bash)'
-    required: false
-    default: 'auto'
-
-runs:
-  using: "composite"
-  steps:
-    - name: Configure basic build (Unix/MSYS2)
-      if: runner.os != 'Windows' || inputs.shell-type == 'msys2'
-      run: |
-        mkdir -p build
-        cd build
-        cmake -G "${{ inputs.generator }}" \
-              -D CMAKE_C_COMPILER=${{ inputs.cc }} \
-              -D CMAKE_CXX_COMPILER=${{ inputs.cxx }} \
-              ${{ inputs.thirdparty-dir != '' && format('-D 3RDPARTY_DIR={0}', inputs.thirdparty-dir) || '' }} \
-              -D CMAKE_BUILD_TYPE=${{ inputs.build-type }} \
-              ${{ inputs.compiler-flags }} ..
-      shell: ${{ inputs.shell-type == 'msys2' && 'msys2 {0}' || 'bash' }}
-
-    - name: Configure basic build (Windows PowerShell)
-      if: runner.os == 'Windows' && inputs.shell-type != 'msys2'
-      run: |
-        mkdir build
-        cd build
-        cmake -G "${{ inputs.generator }}" `
-              -D CMAKE_C_COMPILER=${{ inputs.cc }} `
-              -D CMAKE_CXX_COMPILER=${{ inputs.cxx }} `
-              ${{ inputs.thirdparty-dir != '' && format('-D 3RDPARTY_DIR={0}', inputs.thirdparty-dir) || '' }} `
-              -D CMAKE_BUILD_TYPE=${{ inputs.build-type }} `
-              ${{ inputs.compiler-flags }} ..
-      shell: pwsh
-
-    - name: Build basic (Unix/MSYS2)
-      if: runner.os != 'Windows' || inputs.shell-type == 'msys2'
-      run: |
-        cd build
-        cmake --build . --config ${{ inputs.build-type }} -- -j 4
-      shell: ${{ inputs.shell-type == 'msys2' && 'msys2 {0}' || 'bash' }}
-
-    - name: Build basic (Windows PowerShell)
-      if: runner.os == 'Windows' && inputs.shell-type != 'msys2'
-      run: |
-        cd build
-        cmake --build . --config ${{ inputs.build-type }}
-      shell: pwsh
-
-    - name: Clean up build (Unix/MSYS2)
-      if: runner.os != 'Windows' || inputs.shell-type == 'msys2'
-      run: rm -rf build
-      shell: ${{ inputs.shell-type == 'msys2' && 'msys2 {0}' || 'bash' }}
-
-    - name: Clean up build (Windows PowerShell)
-      if: runner.os == 'Windows' && inputs.shell-type != 'msys2'
-      run: Remove-Item -Recurse -Force build
-      shell: pwsh

.github/actions/cmake-build-full/action.yml

@@ -1,149 +0,0 @@
-name: 'CMake Full Build'
-description: 'Configure and build OCCT with full configuration (shared/static)'
-
-inputs:
-  generator:
-    description: 'CMake generator'
-    required: true
-    default: 'Ninja'
-  cc:
-    description: 'C compiler'
-    required: true
-  cxx:
-    description: 'C++ compiler'
-    required: true
-  build-type:
-    description: 'Build type (Debug, Release)'
-    required: false
-    default: 'Release'
-  library-type:
-    description: 'Library type (Shared, Static)'
-    required: false
-    default: 'Shared'
-  opt-profile:
-    description: 'Optimization profile (Production, Default)'
-    required: false
-    default: 'Production'
-  compiler-flags:
-    description: 'Additional compiler flags'
-    required: false
-    default: ''
-  thirdparty-dir:
-    description: '3rd party directory'
-    required: false
-    default: ''
-  rapidjson-dir:
-    description: 'RapidJSON directory'
-    required: false
-    default: ''
-  use-vtk:
-    description: 'Enable VTK'
-    required: false
-    default: 'ON'
-  use-tbb:
-    description: 'Enable TBB'
-    required: false
-    default: 'ON'
-  with-debug:
-    description: 'Enable BUILD_WITH_DEBUG'
-    required: false
-    default: 'OFF'
-  shell-type:
-    description: 'Shell type to use (powershell, msys2, bash)'
-    required: false
-    default: 'auto'
-
-runs:
-  using: "composite"
-  steps:
-    - name: Configure full build (Unix/MSYS2)
-      if: runner.os != 'Windows' || inputs.shell-type == 'msys2'
-      run: |
-        mkdir -p build
-        cd build
-        cmake -G "${{ inputs.generator }}" \
-              -D CMAKE_C_COMPILER=${{ inputs.cc }} \
-              -D CMAKE_CXX_COMPILER=${{ inputs.cxx }} \
-              ${{ inputs.thirdparty-dir != '' && format('-D 3RDPARTY_DIR={0}', inputs.thirdparty-dir) || '' }} \
-              ${{ inputs.rapidjson-dir != '' && format('-D 3RDPARTY_RAPIDJSON_DIR={0}', inputs.rapidjson-dir) || '' }} \
-              -D BUILD_USE_PCH=OFF \
-              -D BUILD_INCLUDE_SYMLINK=ON \
-              -D BUILD_OPT_PROFILE=${{ inputs.opt-profile }} \
-              -D BUILD_LIBRARY_TYPE=${{ inputs.library-type }} \
-              ${{ inputs.with-debug == 'ON' && '-D BUILD_WITH_DEBUG=ON' || '' }} \
-              -D USE_TK=ON \
-              -D CMAKE_BUILD_TYPE=${{ inputs.build-type }} \
-              -D USE_MMGR_TYPE=JEMALLOC \
-              -D INSTALL_DIR=${{ github.workspace }}/install-${{ inputs.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=${{ inputs.use-vtk }} \
-              -D USE_TBB=${{ inputs.use-tbb }} \
-              -D USE_RAPIDJSON=ON \
-              -D USE_OPENGL=ON \
-              ${{ inputs.compiler-flags }} ..
-      shell: ${{ inputs.shell-type == 'msys2' && 'msys2 {0}' || 'bash' }}
-
-    - name: Configure full build (Windows PowerShell)
-      if: runner.os == 'Windows' && inputs.shell-type != 'msys2'
-      run: |
-        mkdir build
-        cd build
-        cmake -G "${{ inputs.generator }}" `
-              -D CMAKE_C_COMPILER=${{ inputs.cc }} `
-              -D CMAKE_CXX_COMPILER=${{ inputs.cxx }} `
-              ${{ inputs.thirdparty-dir != '' && format('-D 3RDPARTY_DIR={0}', inputs.thirdparty-dir) || '' }} `
-              ${{ inputs.rapidjson-dir != '' && format('-D 3RDPARTY_RAPIDJSON_DIR={0}', inputs.rapidjson-dir) || '' }} `
-              -D BUILD_USE_PCH=OFF `
-              -D BUILD_INCLUDE_SYMLINK=ON `
-              -D BUILD_OPT_PROFILE=${{ inputs.opt-profile }} `
-              -D BUILD_LIBRARY_TYPE=${{ inputs.library-type }} `
-              ${{ inputs.with-debug == 'ON' && '-D BUILD_WITH_DEBUG=ON' || '' }} `
-              -D USE_TK=ON `
-              -D CMAKE_BUILD_TYPE=${{ inputs.build-type }} `
-              -D USE_MMGR_TYPE=JEMALLOC `
-              -D INSTALL_DIR=${{ github.workspace }}/install-${{ inputs.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=${{ inputs.use-vtk }} `
-              -D USE_TBB=${{ inputs.use-tbb }} `
-              -D USE_RAPIDJSON=ON `
-              -D USE_OPENGL=ON `
-              ${{ inputs.compiler-flags }} ..
-      shell: pwsh
-
-    - name: Build full (Unix/MSYS2)
-      if: runner.os != 'Windows' || inputs.shell-type == 'msys2'
-      run: |
-        cd build
-        cmake --build . --target install --config ${{ inputs.build-type }} -- -j 4
-      shell: ${{ inputs.shell-type == 'msys2' && 'msys2 {0}' || 'bash' }}
-
-    - name: Build full (Windows PowerShell)
-      if: runner.os == 'Windows' && inputs.shell-type != 'msys2'
-      run: |
-        cd build
-        cmake --build . --target install --config ${{ inputs.build-type }}
-      shell: pwsh
-
-    - name: Clean up build (Unix/MSYS2)
-      if: runner.os != 'Windows' || inputs.shell-type == 'msys2'
-      run: |
-        rm -rf build
-        rm -rf ${{ github.workspace }}/install-${{ inputs.build-type }}
-      shell: ${{ inputs.shell-type == 'msys2' && 'msys2 {0}' || 'bash' }}
-
-    - name: Clean up build (Windows PowerShell)
-      if: runner.os == 'Windows' && inputs.shell-type != 'msys2'
-      run: |
-        Remove-Item -Recurse -Force build
-        Remove-Item -Recurse -Force ${{ github.workspace }}/install-${{ inputs.build-type }}
-      shell: pwsh

.github/actions/configure-occt/action.yml

@@ -1,169 +0,0 @@
-name: 'Configure OCCT'
-description: 'Setup vcpkg and configure OCCT on a specific platform without building'
-
-inputs:
-  platform:
-    description: 'Platform (windows, macos, linux)'
-    required: true
-  compiler:
-    description: 'Compiler (msvc, clang, gcc)'
-    required: true
-  additional-cmake-flags:
-    description: 'Additional CMake flags'
-    required: false
-    default: ''
-  use-vtk:
-    description: 'Enable VTK'
-    required: false
-    default: 'true'
-  build-use-pch:
-    description: 'Enable precompiled headers'
-    required: false
-    default: 'true'
-  build-opt-profile:
-    description: 'Build optimization profile'
-    required: false
-    default: 'Production'
-  cmake-build-type:
-    description: 'CMake build type (Release, Debug, etc)'
-    required: false
-    default: 'Release'
-  github-token:
-    description: 'GitHub token for vcpkg NuGet package access'
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Setup vcpkg
-      uses: ./.github/actions/vcpkg-setup
-      with:
-        github-token: ${{ inputs.github-token }}
-
-    - name: Download and extract Mesa3D (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      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
-      shell: pwsh
-
-    - name: Run system-wide deployment (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      run: |
-        cd mesa3d
-        .\systemwidedeploy.cmd 1
-        .\systemwidedeploy.cmd 5
-      shell: cmd
-
-    - name: Install dependencies (Linux)
-      if: ${{ inputs.platform == 'linux' }}
-      run: sudo apt-get update && sudo apt-get install -y cmake ${{ inputs.compiler == 'clang' && 'clang' || 'gcc g++' }} make libglu1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev
-      shell: bash
-
-    - name: Install required packages (macOS)
-      if: ${{ inputs.platform == 'macos' }}
-      run: |
-        brew update || 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
-      shell: bash
-
-    - name: Configure OCCT (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      run: |
-          mkdir build
-          cd build
-          cmake -T ${{ inputs.compiler == 'msvc' && 'host=x64' || 'ClangCL' }} `
-                -D USE_FREETYPE=ON `
-                -D USE_TK=ON `
-                -D BUILD_USE_PCH=${{ inputs.build-use-pch }} `
-                -D BUILD_OPT_PROFILE=${{ inputs.build-opt-profile }} `
-                -D BUILD_INCLUDE_SYMLINK=ON `
-                -D CMAKE_BUILD_TYPE=${{ inputs.cmake-build-type }} `
-                -D INSTALL_DIR=${{ github.workspace }}/install `
-                -D BUILD_USE_VCPKG=ON `
-                -D VCPKG_TARGET_TRIPLET=x64-windows `
-                -D USE_D3D=ON `
-                -D USE_DRACO=ON `
-                -D USE_FFMPEG=ON `
-                -D USE_FREEIMAGE=ON `
-                -D USE_GLES2=ON `
-                -D USE_OPENVR=ON `
-                -D USE_VTK=${{ inputs.use-vtk }} `
-                -D USE_TBB=ON `
-                -D USE_RAPIDJSON=ON `
-                -D USE_OPENGL=ON `
-                -D BUILD_GTEST=ON `
-                -D BUILD_CPP_STANDARD=C++17 `
-                -D INSTALL_GTEST=ON `
-                ${{ inputs.additional-cmake-flags }} ..
-          echo "Configuration completed successfully for Windows"
-      shell: pwsh
-
-    - name: Configure OCCT (macOS)
-      if: ${{ inputs.platform == 'macos' }}
-      run: |
-        mkdir -p build
-        cd build
-        cmake -G "Unix Makefiles" \
-              -D CMAKE_C_COMPILER=${{ inputs.compiler == 'clang' && 'clang' || 'gcc' }} \
-              -D CMAKE_CXX_COMPILER=${{ inputs.compiler == 'clang' && 'clang++' || 'g++' }} \
-              -D BUILD_USE_PCH=${{ inputs.build-use-pch }} \
-              -D BUILD_OPT_PROFILE=${{ inputs.build-opt-profile }} \
-              -D BUILD_INCLUDE_SYMLINK=ON \
-              -D CMAKE_BUILD_TYPE=${{ inputs.cmake-build-type }} \
-              -D INSTALL_DIR=${{ github.workspace }}/install \
-              -D BUILD_USE_VCPKG=ON \
-              -D VCPKG_TARGET_TRIPLET=arm64-osx-dynamic \
-              -D USE_RAPIDJSON=ON \
-              -D USE_DRACO=ON \
-              -D USE_FREETYPE=ON \
-              -D USE_OPENGL=ON \
-              -D USE_FREEIMAGE=ON \
-              -D BUILD_GTEST=ON \
-              -D BUILD_CPP_STANDARD=C++17 \
-              -D INSTALL_GTEST=ON \
-              -D CMAKE_CXX_FLAGS="-Werror -Wall -Wextra" \
-              ${{ inputs.additional-cmake-flags }} ..
-        echo "Configuration completed successfully for macOS"
-      shell: bash
-
-    - name: Configure OCCT (Linux)
-      if: ${{ inputs.platform == 'linux' }}
-      run: |
-        mkdir -p build
-        cd build
-        # Set environment to help vcpkg find system libraries
-        export PKG_CONFIG_PATH="/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"
-        export CMAKE_PREFIX_PATH="/usr:/usr/local:$CMAKE_PREFIX_PATH"
-        cmake -G "Unix Makefiles" \
-              -D CMAKE_C_COMPILER=${{ inputs.compiler == 'clang' && 'clang' || 'gcc' }} \
-              -D CMAKE_CXX_COMPILER=${{ inputs.compiler == 'clang' && 'clang++' || 'g++' }} \
-              -D BUILD_USE_PCH=${{ inputs.build-use-pch }} \
-              -D BUILD_INCLUDE_SYMLINK=ON \
-              -D BUILD_OPT_PROFILE=${{ inputs.build-opt-profile }} \
-              -D USE_TK=ON \
-              -D CMAKE_BUILD_TYPE=${{ inputs.cmake-build-type }} \
-              -D INSTALL_DIR=${{ github.workspace }}/install \
-              -D BUILD_USE_VCPKG=ON \
-              -D BUILD_LIBRARY_TYPE=Shared \
-              -D VCPKG_TARGET_TRIPLET=x64-linux-dynamic \
-              -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=${{ inputs.use-vtk }} \
-              -D USE_TBB=ON \
-              -D USE_RAPIDJSON=ON \
-              -D USE_OPENGL=ON \
-              -D BUILD_GTEST=ON \
-              -D BUILD_CPP_STANDARD=C++17 \
-              -D INSTALL_GTEST=ON \
-              ${{ inputs.additional-cmake-flags }} ..
-        echo "Configuration completed successfully for Linux"
-      shell: bash

.github/actions/download-vcpkg-cache/action.yml

@@ -1,79 +0,0 @@
-name: 'Download vcpkg Cache'
-description: 'Download and restore vcpkg installed packages and cache'
-
-inputs:
-  artifact-name:
-    description: 'Name of the artifact containing vcpkg cache'
-    required: true
-  build-directory:
-    description: 'Build directory where vcpkg_installed should be restored'
-    required: false
-    default: 'build'
-
-runs:
-  using: "composite"
-  steps:
-
-    - name: Download vcpkg tar archive
-      uses: actions/download-artifact@v4.3.0
-      with:
-        name: ${{ inputs.artifact-name }}
-        path: ${{ inputs.build-directory }}
-
-    - name: Extract vcpkg dependencies
-      run: |
-        cd ${{ inputs.build-directory }}
-        tar -xzf vcpkg-dependencies.tar.gz
-        rm vcpkg-dependencies.tar.gz
-      shell: bash
-
-    - name: Copy manual-link libraries and set paths for Windows
-      if: runner.os == 'Windows'
-      run: |
-        $vcpkg_bin = "${{ inputs.build-directory }}/vcpkg_installed/x64-windows/bin"
-        $vcpkg_lib = "${{ inputs.build-directory }}/vcpkg_installed/x64-windows/lib"
-        $vcpkg_manual = "${{ inputs.build-directory }}/vcpkg_installed/x64-windows/lib/manual-link"
-        
-        # Copy manual-link DLLs to bin directory for runtime access
-        if (Test-Path $vcpkg_manual) {
-          Write-Host "Copying manual-link libraries to bin directory"
-          Copy-Item "$vcpkg_manual\*" "$vcpkg_bin\" -Force -ErrorAction SilentlyContinue
-        }
-        
-        # Set library search paths
-        $current_path = $env:PATH
-        echo "PATH=$vcpkg_bin;$vcpkg_lib;$vcpkg_manual;$current_path" >> $env:GITHUB_ENV
-      shell: pwsh
-
-    - name: Copy manual-link libraries and set paths for Linux
-      if: runner.os == 'Linux'
-      run: |
-        vcpkg_lib="${{ inputs.build-directory }}/vcpkg_installed/x64-linux-dynamic/lib"
-        vcpkg_manual="${{ inputs.build-directory }}/vcpkg_installed/x64-linux-dynamic/lib/manual-link"
-        
-        # Copy manual-link libraries to main lib directory for runtime access
-        if [ -d "$vcpkg_manual" ]; then
-          echo "Copying manual-link libraries to main lib directory"
-          cp -f "$vcpkg_manual"/* "$vcpkg_lib/" 2>/dev/null || true
-        fi
-        
-        # Set library search paths
-        echo "LD_LIBRARY_PATH=$vcpkg_lib:$vcpkg_manual:$LD_LIBRARY_PATH" >> $GITHUB_ENV
-      shell: bash
-
-    - name: Copy manual-link libraries and set paths for macOS
-      if: runner.os == 'macOS'
-      run: |
-        vcpkg_lib="${{ inputs.build-directory }}/vcpkg_installed/arm64-osx-dynamic/lib"
-        vcpkg_manual="${{ inputs.build-directory }}/vcpkg_installed/arm64-osx-dynamic/lib/manual-link"
-        
-        # Copy manual-link libraries to main lib directory for runtime access
-        if [ -d "$vcpkg_manual" ]; then
-          echo "Copying manual-link libraries to main lib directory"
-          cp -f "$vcpkg_manual"/* "$vcpkg_lib/" 2>/dev/null || true
-        fi
-        
-        # Set library search paths
-        echo "DYLD_FALLBACK_LIBRARY_PATH=$vcpkg_lib:$vcpkg_manual:$DYLD_FALLBACK_LIBRARY_PATH" >> $GITHUB_ENV
-        echo "DYLD_LIBRARY_PATH=$vcpkg_lib:$vcpkg_manual:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
-      shell: bash

.github/actions/retest-failures/action.yml

@@ -1,319 +0,0 @@
-name: 'Retest Failures'
-description: 'Rerun failed tests and update test results'
-
-inputs:
-  platform:
-    description: 'Platform (windows, macos, linux)'
-    required: true
-  compiler:
-    description: 'Compiler (msvc, clang, gcc)'
-    required: true
-  install-artifact-name:
-    description: 'Name of the artifact containing the install directory'
-    required: true
-  results-artifact-name:
-    description: 'Name of the artifact containing the test results'
-    required: true
-  test-directory-name:
-    description: 'Name of the directory containing test results'
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Download previous test results (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      uses: actions/download-artifact@v4.3.0
-      with:
-        name: ${{ inputs.results-artifact-name }}
-        path: install/results
-      
-    - name: Download previous test results (macOS/Linux)
-      if: ${{ inputs.platform != 'windows' }}
-      uses: actions/download-artifact@v4.3.0
-      with:
-        name: ${{ inputs.results-artifact-name }}
-        path: install/bin/results
-
-    - name: Check for test failures (Windows)
-      id: check_failures_windows
-      if: ${{ inputs.platform == 'windows' }}
-      shell: pwsh
-      run: |
-        $failedCount = 0
-        if (Test-Path "install/results/${{ inputs.test-directory-name }}/tests.log") {
-          $content = Get-Content "install/results/${{ inputs.test-directory-name }}/tests.log"
-          $totalLine = $content | Select-String "Total cases:"
-          if ($totalLine) {
-            if ($totalLine -match "FAILED") {
-              $failedCount = ($totalLine | ForEach-Object { $_.Line -replace '.*?(\d+) FAILED.*','$1' }) -as [int]
-            }
-          }
-          echo "failed_count=$failedCount" >> $env:GITHUB_OUTPUT
-          if ($failedCount -gt 0) {
-            echo "Tests failed count: $failedCount"
-          }
-        }
-
-    - name: Check for test failures (macOS/Linux)
-      id: check_failures_unix
-      if: ${{ inputs.platform != 'windows' }}
-      shell: bash
-      run: |
-        failed_count=0
-        if [ -f "install/bin/results/${{ inputs.test-directory-name }}/tests.log" ]; then
-          total_line=$(grep "Total cases:" install/bin/results/${{ inputs.test-directory-name }}/tests.log)
-          if [ ! -z "$total_line" ]; then
-            if [[ $total_line =~ "FAILED" ]]; then
-              failed_count=$(echo "$total_line" | grep -o "[0-9]* FAILED" | awk '{print $1}')
-            fi
-          fi
-          echo "failed_count=$failed_count" >> $GITHUB_OUTPUT
-          if [ "$failed_count" -gt 0 ]; then
-            echo "Tests failed count: $failed_count"
-          fi
-        fi
-
-    - name: Set failed count
-      id: check_failures
-      shell: ${{ inputs.platform == 'windows' && 'pwsh' || 'bash' }}
-      run: |
-        ${{ inputs.platform == 'windows' && format('
-        echo "failed_count={0}" >> $env:GITHUB_OUTPUT
-        ', steps.check_failures_windows.outputs.failed_count) || format('
-        echo "failed_count={0}" >> $GITHUB_OUTPUT
-        ', steps.check_failures_unix.outputs.failed_count) }}
-
-    - name: Download vcpkg cache
-      if: steps.check_failures.outputs.failed_count > 0
-      uses: ./.github/actions/download-vcpkg-cache
-      with:
-        artifact-name: ${{ inputs.install-artifact-name }}-cache
-
-    - name: Install dependencies (Linux)
-      if: ${{ inputs.platform == 'linux' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: bash
-      run: sudo apt-get update && sudo apt-get install -y cmake ${{ inputs.compiler == 'clang' && 'clang' || 'gcc g++' }} make libglu1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev fonts-noto-cjk fonts-liberation fonts-ubuntu fonts-liberation fonts-ubuntu fonts-noto-cjk fonts-ipafont-gothic fonts-ipafont-mincho fonts-unfonts-core
-
-    - name: Setup Xvfb and Mesa (Linux)
-      if: ${{ inputs.platform == 'linux' && steps.check_failures.outputs.failed_count > 0 }}
-      uses: ./.github/actions/setup-xvfb-mesa
-
-    - name: Download test data (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: pwsh
-      run: |
-        cd data
-        Invoke-WebRequest -Uri https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_9_0_beta1/opencascade-dataset-7.9.0.zip -OutFile opencascade-dataset-7.9.0.zip
-        Expand-Archive -Path opencascade-dataset-7.9.0.zip -DestinationPath .
-        Remove-Item opencascade-dataset-7.9.0.zip
-
-    - name: Download test data (macOS/Linux)
-      if: ${{ (inputs.platform == 'macos' || inputs.platform == 'linux') && steps.check_failures.outputs.failed_count > 0 }}
-      shell: bash
-      run: |
-        cd data
-        curl -L -O https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_9_0_beta1/opencascade-dataset-7.9.0.${{ inputs.platform == 'macos' && 'tar.xz' || 'tar.xz' }}
-        tar -xf opencascade-dataset-7.9.0.tar.xz
-
-    - name: Download and extract install directory
-      if: steps.check_failures.outputs.failed_count > 0
-      uses: actions/download-artifact@v4.3.0
-      with:
-        name: ${{ inputs.install-artifact-name }}
-        path: install
-
-    - name: Download and extract Mesa3D (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: pwsh
-      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 (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: cmd
-      run: |
-        cd mesa3d
-        .\systemwidedeploy.cmd 1
-        .\systemwidedeploy.cmd 5
-
-    - name: Install CJK Fonts (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: pwsh
-      run: |
-        Invoke-WebRequest -Uri https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip -OutFile Noto-hinted.zip
-        Expand-Archive -Path Noto-hinted.zip -DestinationPath $env:windir\Fonts
-        Remove-Item Noto-hinted.zip
-
-    - name: Set execute permissions on DRAWEXE (macOS/Linux)
-      if: ${{ (inputs.platform == 'macos' || inputs.platform == 'linux') && steps.check_failures.outputs.failed_count > 0 }}
-      shell: bash
-      run: chmod +x install/${{ inputs.platform == 'macos' && 'bin' || 'bin' }}/DRAWEXE
-
-    - name: Run regression tests (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: cmd
-      run: |
-        cd install
-        call env.bat vc14 win64 release
-        DRAWEXE.exe -v -c testgrid -regress results/${{ inputs.test-directory-name }} -outdir results/${{ inputs.test-directory-name }}-retest -parallel 0
-      env:
-        LIBGL_ALWAYS_SOFTWARE: 1
-        CSF_TestScriptsPath: ${{ github.workspace }}/tests
-        CSF_TestDataPath: ${{ github.workspace }}/data
-
-    - name: Run regression tests (macOS/Linux)
-      if: ${{ (inputs.platform == 'macos' || inputs.platform == 'linux') && steps.check_failures.outputs.failed_count > 0 }}
-      shell: bash
-      run: |
-         cd install
-         cd bin
-         source env.sh
-         ./DRAWEXE -v -c testgrid -regress results/${{ inputs.test-directory-name }} -outdir results/${{ inputs.test-directory-name }}-retest -parallel 0
-      env:
-        DISPLAY: ${{ inputs.platform == 'linux' && ':99' || '' }}
-        LIBGL_ALWAYS_SOFTWARE: 1
-        CSF_TestScriptsPath: ${{ github.workspace }}/tests
-        CSF_TestDataPath: ${{ github.workspace }}/data
-
-    - name: Repeating failed tests (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 && steps.check_failures.outputs.failed_count < 20 }}
-      shell: cmd
-      run: |
-        cd install
-        call env.bat vc14 win64 release
-        # Repeat failed tests for 10 times
-        for /l %%i in (1,1,10) do (
-          DRAWEXE.exe -v -c testgrid -regress results/${{ inputs.test-directory-name }}-retest -outdir results/${{ inputs.test-directory-name }}-retest -parallel 0 -overwrite
-          DRAWEXE.exe -v -c "testsummarize results/${{ inputs.test-directory-name }}-retest"
-        )
-      env:
-        LIBGL_ALWAYS_SOFTWARE: 1
-        CSF_TestScriptsPath: ${{ github.workspace }}/tests
-        CSF_TestDataPath: ${{ github.workspace }}/data
-
-    - name: Repeating failed tests (macOS/Linux)
-      if: ${{ inputs.platform != 'windows' && steps.check_failures.outputs.failed_count > 0 && steps.check_failures.outputs.failed_count < 20 }}
-      shell: bash
-      run: |
-        cd install
-        cd bin
-        source env.sh
-        # Repeat failed tests for 10 times
-        for i in {1..10}; do
-          ./DRAWEXE -v -c testgrid -regress results/${{ inputs.test-directory-name }}-retest -outdir results/${{ inputs.test-directory-name }}-retest -parallel 0 -overwrite
-          ./DRAWEXE -v -c "testsummarize results/${{ inputs.test-directory-name }}-retest"
-        done
-      env:
-        DISPLAY: ${{ inputs.platform == 'linux' && ':99' || '' }}
-        LIBGL_ALWAYS_SOFTWARE: 1
-        CSF_TestScriptsPath: ${{ github.workspace }}/tests
-        CSF_TestDataPath: ${{ github.workspace }}/data
-
-    - name: Upload regression test results (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: ${{ inputs.results-artifact-name }}-retest
-        path: install/results/${{ inputs.test-directory-name }}-retest
-        retention-days: 15
-        overwrite: true
-        
-    - name: Upload regression test results (macOS/Linux)
-      if: ${{ inputs.platform != 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: ${{ inputs.results-artifact-name }}-retest
-        path: install/bin/results/${{ inputs.test-directory-name }}-retest
-        retention-days: 15
-        overwrite: true
-
-    - name: Copy retest results back to original location (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: cmd
-      run: |
-        cd install\results\${{ inputs.test-directory-name }}-retest
-        if exist "*" (
-          xcopy /s /y /i . "..\${{ inputs.test-directory-name }}"
-          cd ..\..
-          call env.bat vc14 win64 release
-          DRAWEXE.exe -v -c "testsummarize results/${{ inputs.test-directory-name }}"
-        ) else (
-          echo No retest results to copy - directory is empty
-        )
-
-    - name: Copy retest results back to original location (macOS/Linux)
-      if: ${{ inputs.platform != 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: bash
-      run: |
-        cd install/bin/results/${{ inputs.test-directory-name }}-retest
-        if [ "$(ls -A)" ]; then
-          cp -rf * ../${{ inputs.test-directory-name }}/
-
-          cd ../../
-          source env.sh
-          ./DRAWEXE -v -c testsummarize results/${{ inputs.test-directory-name }}
-        else
-          echo "No retest results to copy - directory is empty"
-        fi
-
-    - name: Upload updated test results (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: ${{ inputs.results-artifact-name }}
-        path: install/results/${{ inputs.test-directory-name }}*
-        retention-days: 15
-        overwrite: true
-
-    - name: Upload updated test results (macOS/Linux)
-      if : ${{ inputs.platform != 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: ${{ inputs.results-artifact-name }}
-        path: install/bin/results/${{ inputs.test-directory-name }}*
-        retention-days: 15
-        overwrite: true
-
-    - name: Check test failures (Windows)
-      if: ${{ inputs.platform == 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: pwsh
-      run: |
-        cd install/results/${{ inputs.test-directory-name }}-retest
-        $failedCount = 0
-        if (Test-Path tests.log) {
-          $content = Get-Content tests.log
-          $totalLine = $content | Select-String "Total cases:"
-          if ($totalLine) {
-            if ($totalLine -match "FAILED") {
-              $failedCount = ($totalLine | ForEach-Object { $_.Line -replace '.*?(\d+) FAILED.*','$1' }) -as [int]
-            }
-          }
-          if ($failedCount -gt 0) {
-            Write-Error "Number of FAILED tests ($failedCount) exceeds threshold of 0"
-            echo "FAILED_COUNT=$failedCount" >> $env:GITHUB_ENV
-            exit 1
-          }
-          Write-Output "Found $failedCount FAILED tests"
-        }
-
-    - name: Check test failures (macOS/Linux)
-      if: ${{ inputs.platform != 'windows' && steps.check_failures.outputs.failed_count > 0 }}
-      shell: bash
-      run: |
-        cd install/bin/results/${{ inputs.test-directory-name }}-retest
-        if [ -f tests.log ]; then
-          TOTAL_LINE=$(grep "Total cases:" tests.log | tail -n1)
-          echo "Total line: $TOTAL_LINE"
-          if [[ $TOTAL_LINE =~ ([0-9]+)[[:space:]]FAILED ]]; then
-            FAILED_COUNT="${BASH_REMATCH[1]}"
-            if [ $FAILED_COUNT -gt 0 ]; then
-              echo "Number of FAILED tests ($FAILED_COUNT) exceeds threshold of 0"
-              echo "::error::Number of FAILED tests ($FAILED_COUNT) exceeds threshold of 0"
-              echo "FAILED_COUNT=$FAILED_COUNT" >> $GITHUB_ENV
-              exit 1
-            fi
-          fi
-          echo "Found 0 FAILED tests"
-        fi

.github/actions/run-gtest/action.yml

@@ -1,132 +0,0 @@
-name: 'Run GTest Validation'
-description: 'Execute GTest suite and validate results'
-
-inputs:
-  platform:
-    description: 'Platform (windows, macos, linux)'
-    required: true
-  compiler:
-    description: 'Compiler (msvc, clang, gcc)'
-    required: true
-  install-artifact-name:
-    description: 'Name of the artifact containing the installed files'
-    required: true
-  artifact-suffix:
-    description: 'Suffix for the GTest results artifact name'
-    required: true
-    default: 'x64'
-
-outputs:
-  has-failures:
-    description: 'Whether any tests failed'
-    value: ${{ steps.check-failures.outputs.has_failures }}
-
-runs:
-  using: "composite"
-  steps:
-    - name: Download and extract install directory
-      uses: actions/download-artifact@v4.3.0
-      with:
-        name: ${{ inputs.install-artifact-name }}
-        path: install
-
-    - name: Download vcpkg cache
-      uses: ./.github/actions/download-vcpkg-cache
-      with:
-        artifact-name: ${{ inputs.install-artifact-name }}-cache
-
-    - 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 clang 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
-
-    - name: Setup Xvfb and Mesa for Linux
-      if: inputs.platform == 'linux'
-      uses: ./.github/actions/setup-xvfb-mesa
-
-    - name: Set execute permissions on Unix platforms
-      if: inputs.platform != 'windows'
-      shell: bash
-      run: |
-        chmod +x install/bin/OpenCascadeGTest
-
-    - name: Run OpenCascadeGTest on Windows
-      if: inputs.platform == 'windows'
-      id: run-gtest-windows
-      shell: cmd
-      run: |
-        cd install
-        call env.bat vc14 win64 release
-        set GTEST_OUTPUT=""
-        OpenCascadeGTest.exe --gtest_output=xml:gtest_results.xml > gtest_output.log 2>&1
-        type gtest_output.log
-        exit /b 0
-
-    - name: Run OpenCascadeGTest on Unix platforms
-      if: inputs.platform != 'windows'
-      id: run-gtest-unix
-      shell: bash
-      env:
-        DISPLAY: ${{ inputs.platform == 'linux' && ':99' || '' }}
-        LIBGL_ALWAYS_SOFTWARE: 1
-      run: |
-        cd install/bin
-        source env.sh
-        ./OpenCascadeGTest --gtest_output=xml:gtest_results.xml > gtest_output.log 2>&1 || true
-        cat gtest_output.log
-
-    - name: Upload GTest results
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: gtest-results-${{ inputs.platform }}-${{ inputs.compiler }}-${{ inputs.artifact-suffix }}
-        path: |
-          install/**/gtest_results.xml
-          install/**/gtest_output.log
-        retention-days: 15
-
-    - name: Check for test failures on Windows
-      if: inputs.platform == 'windows'
-      id: check-failures-windows
-      shell: pwsh
-      run: |
-        cd install
-        $log = Get-Content "gtest_output.log" -Raw
-        if ($log -match "\[\s+FAILED\s+\]") {
-          Write-Error "GTest failures detected in the output."
-          echo "has_failures=true" >> $env:GITHUB_OUTPUT
-        } else {
-          Write-Output "No GTest failures detected."
-          echo "has_failures=false" >> $env:GITHUB_OUTPUT
-        }
-
-    - name: Check for test failures on Unix
-      if: inputs.platform != 'windows'
-      id: check-failures-unix
-      shell: bash
-      run: |
-        cd install/bin
-        if grep -q "\[  FAILED  \]" gtest_output.log; then
-          echo "::error::GTest failures detected in the output."
-          echo "has_failures=true" >> $GITHUB_OUTPUT
-        else
-          echo "No GTest failures detected."
-          echo "has_failures=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Set combined output
-      id: check-failures
-      shell: bash
-      run: |
-        if [ "${{ inputs.platform }}" == "windows" ]; then
-          echo "has_failures=${{ steps.check-failures-windows.outputs.has_failures }}" >> $GITHUB_OUTPUT
-        else
-          echo "has_failures=${{ steps.check-failures-unix.outputs.has_failures }}" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Fail job if tests failed
-      if: steps.check-failures.outputs.has_failures == 'true'
-      shell: bash
-      run: |
-        echo "::error::GTest failures detected"
-        exit 1

.github/actions/run-tests/action.yml

@@ -1,166 +0,0 @@
-name: 'Run Tests'
-description: 'Run OCCT tests on a specific platform'
-
-inputs:
-  platform:
-    description: 'Platform (windows, macos, linux)'
-    required: true
-  compiler:
-    description: 'Compiler (msvc, clang, gcc)'
-    required: true
-  install-artifact-name:
-    description: 'Name of the artifact containing the install directory'
-    required: true
-  test-directory-name:
-    description: 'Name of the directory to store test results'
-    required: true
-  test-script:
-    description: 'The test script to run'
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Download vcpkg cache
-      uses: ./.github/actions/download-vcpkg-cache
-      with:
-        artifact-name: ${{ inputs.install-artifact-name }}-cache
-
-    - name: Install dependencies (Linux)
-      if: ${{ inputs.platform == 'linux' }}
-      run: sudo apt-get update && sudo apt-get install -y cmake ${{ inputs.compiler == 'gcc' && 'gcc g++' || 'clang' }} make libglu1-mesa-dev libegl1-mesa-dev fonts-noto-cjk fonts-liberation fonts-ubuntu fonts-liberation fonts-ubuntu fonts-noto-cjk fonts-ipafont-gothic fonts-ipafont-mincho fonts-unfonts-core
-      shell: bash
-
-    - name: Setup Xvfb and Mesa (Linux)
-      if: ${{ inputs.platform == 'linux' }}
-      uses: ./.github/actions/setup-xvfb-mesa
-
-    - name: Download and extract test data (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      run: |
-        cd data
-        Invoke-WebRequest -Uri https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_9_0_beta1/opencascade-dataset-7.9.0.zip -OutFile opencascade-dataset-7.9.0.zip
-        Expand-Archive -Path opencascade-dataset-7.9.0.zip -DestinationPath .
-        Remove-Item opencascade-dataset-7.9.0.zip
-      shell: pwsh
-
-    - name: Download test data (macOS/Linux)
-      if: ${{ (inputs.platform == 'macos' || inputs.platform == 'linux') }}
-      run: |
-        cd data
-        wget -q https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_9_0_beta1/opencascade-dataset-7.9.0.tar.xz
-        tar -xf opencascade-dataset-7.9.0.tar.xz
-      shell: bash
-
-    - name: Download and extract install directory
-      uses: actions/download-artifact@v4.3.0
-      with:
-        name: ${{ inputs.install-artifact-name }}
-        path: install
-
-    - name: Download and extract Mesa3D (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      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
-      shell: pwsh
-
-    - name: Run system-wide deployment (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      run: |
-        cd mesa3d
-        .\systemwidedeploy.cmd 1
-        .\systemwidedeploy.cmd 5
-      shell: cmd
-
-    - name: Install CJK Fonts (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      run: |
-        Invoke-WebRequest -Uri https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip -OutFile Noto-hinted.zip
-        Expand-Archive -Path Noto-hinted.zip -DestinationPath $env:windir\Fonts
-        Remove-Item Noto-hinted.zip
-      shell: pwsh
-
-    - name: Set LIBGL_ALWAYS_SOFTWARE environment variable (macOS)
-      if: ${{ inputs.platform == 'macos' }}
-      run: echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
-      shell: bash
-
-    - name: Set execute permissions on DRAWEXE (macOS/Linux)
-      if: ${{ inputs.platform == 'macos' || inputs.platform == 'linux' }}
-      run: chmod +x install/bin/DRAWEXE
-      shell: bash
-
-    - name: Run tests (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      run: |
-        cd install
-        call env.bat vc14 win64 release
-        DRAWEXE.exe -v -f ${{ github.workspace }}/${{ inputs.test-script }}
-      shell: cmd
-      env:
-        LIBGL_ALWAYS_SOFTWARE: 1
-        CSF_TestScriptsPath: ${{ github.workspace }}/tests
-        CSF_TestDataPath: ${{ github.workspace }}/data
-
-    - name: Run tests (macOS/Linux)
-      if: ${{ inputs.platform == 'macos' || inputs.platform == 'linux' }}
-      run: |
-         cd install
-         cd bin
-         source env.sh
-         ./DRAWEXE -v -f ${{ github.workspace }}/${{ inputs.test-script }}
-      shell: bash
-      env:
-        DISPLAY: ${{ inputs.platform == 'linux' && ':99' || '' }}
-        LIBGL_ALWAYS_SOFTWARE: 1
-        CSF_TestScriptsPath: ${{ github.workspace }}/tests
-        CSF_TestDataPath: ${{ github.workspace }}/data
-
-    - name: Clean up test results (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      run: |
-        cd install
-        call env.bat vc14 win64 release
-        DRAWEXE.exe -v -c cleanuptest results/${{ inputs.test-directory-name }}
-      shell: cmd
-      env:
-        LIBGL_ALWAYS_SOFTWARE: 1
-        CSF_TestScriptsPath: ${{ github.workspace }}/tests
-        CSF_TestDataPath: ${{ github.workspace }}/data
-
-    - name: Clean up test results (macOS/Linux)
-      if: ${{ inputs.platform == 'macos' || inputs.platform == 'linux' }}
-      run: |
-         cd install
-         cd bin
-         source env.sh
-         ./DRAWEXE -v -c cleanuptest results/${{ inputs.test-directory-name }}
-      shell: bash
-      env:
-        DISPLAY: ${{ inputs.platform == 'linux' && ':99' || '' }}
-        LIBGL_ALWAYS_SOFTWARE: 1
-        CSF_TestScriptsPath: ${{ github.workspace }}/tests
-        CSF_TestDataPath: ${{ github.workspace }}/data
-
-    - name: Upload test results (Windows)
-      if: ${{ inputs.platform == 'windows' }}
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: results-${{ inputs.test-directory-name }}
-        path: |
-          install/results/**/*.log
-          install/results/**/*.png
-          install/results/**/*.html
-        retention-days: 15
-
-    - name: Upload test results (macOS/Linux)
-      if: ${{ inputs.platform == 'macos' || inputs.platform == 'linux' }}
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: results-${{ inputs.test-directory-name }}
-        path: |
-          install/bin/results/**/*.log
-          install/bin/results/**/*.png
-          install/bin/results/**/*.html
-        retention-days: 15

.github/actions/scripts/cleanup_test_images.py

@@ -1,90 +0,0 @@
-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-msys2/action.yml

@@ -1,30 +0,0 @@
-name: 'Setup MSYS2'
-description: 'Setup MSYS2 environment for MinGW builds'
-
-inputs:
-  msystem:
-    description: 'MSYS2 subsystem (MINGW64, CLANG64, UCRT64)'
-    required: true
-  packages:
-    description: 'Packages to install'
-    required: true
-  dependencies:
-    description: 'Additional dependencies to install'
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Set up MSYS2
-      uses: msys2/setup-msys2@v2
-      with:
-        msystem: ${{ inputs.msystem }}
-        update: true
-        install: ${{ inputs.packages }} ${{ inputs.dependencies }}
-
-    - name: Setup environment
-      shell: msys2 {0}
-      run: |
-        echo "Setting up environment variables..."
-        echo "$MSYSTEM_PREFIX/bin" >> $GITHUB_PATH
-        echo "CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX" >> $GITHUB_ENV

.github/actions/setup-ubuntu-deps/action.yml

@@ -1,15 +0,0 @@
-name: 'Setup Ubuntu Dependencies'
-description: 'Install Ubuntu dependencies and rapidjson for OCCT builds'
-
-runs:
-  using: "composite"
-  steps:
-    - 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
-      shell: bash
-
-    - name: Install rapidjson
-      run: |
-        wget https://github.com/Tencent/rapidjson/archive/858451e5b7d1c56cf8f6d58f88cf958351837e53.zip -O rapidjson.zip
-        unzip rapidjson.zip
-      shell: bash

.github/actions/setup-windows-msvc-deps/action.yml

@@ -1,30 +0,0 @@
-name: 'Setup Windows MSVC Dependencies'
-description: 'Download and setup 3rdparty dependencies and Mesa3D for Windows MSVC builds'
-
-runs:
-  using: "composite"
-  steps:
-    - 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
-      shell: pwsh
-
-    - name: Run system-wide deployment
-      run: |
-        cd mesa3d
-        .\systemwidedeploy.cmd 1
-        .\systemwidedeploy.cmd 5
-      shell: cmd

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

@@ -1,18 +0,0 @@
-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/test-summary/action.yml

@@ -1,134 +0,0 @@
-name: 'Test Summary'
-description: 'Compare test results between current branch and master'
-
-runs:
-  using: "composite"
-  steps:
-    - name: Download vcpkg cache
-      uses: ./.github/actions/download-vcpkg-cache
-      with:
-        artifact-name: install-linux-clang-x64-cache
-
-    - name: Install dependencies
-      run: sudo apt-get update && sudo apt-get install -y cmake clang g++ make libglu1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev
-      shell: bash
-
-    - name: Setup Xvfb and Mesa
-      uses: ./.github/actions/setup-xvfb-mesa
-
-    - name: Set environment variables
-      run: |
-        echo "DISPLAY=:99" >> $GITHUB_ENV
-        echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
-      shell: bash
-
-    - name: Download and extract install directory
-      uses: actions/download-artifact@v4.3.0
-      with:
-        name: install-linux-clang-x64
-        path: install
-
-    - name: Set execute permissions on DRAWEXE
-      run: chmod +x install/bin/DRAWEXE
-      shell: bash
-
-    - name: Get latest workflow run ID from target branch
-      id: get_run_id
-      run: |
-        response=$(curl -s \
-          -H "Accept: application/vnd.github.v3+json" \
-          "https://api.github.com/repos/${{ github.repository }}/actions/runs?branch=${{ github.event.pull_request.base.ref }}&status=success")
-        latest_run_id=$(echo "$response" | jq -r \
-          --arg repo "${{ github.repository }}" \
-          '.workflow_runs[] | select(.name=="Build and Test OCCT on Multiple Platforms" and .head_repository.full_name==$repo) | .id' | head -n 1)
-        echo "latest_run_id=$latest_run_id" >> $GITHUB_ENV
-      shell: bash
-
-    - name: Download master branch test results
-      env:
-        GH_TOKEN: ${{ github.token }}
-      run: |
-        for platform in windows-x64 macos-x64 linux-clang-x64; do
-          echo "Downloading results for $platform"
-          gh run download ${{ env.latest_run_id }} -n "results-$platform" -D "install/bin/results/master/"
-        done
-      shell: bash
-
-    - name: Download current branch test results
-      env:
-        GH_TOKEN: ${{ github.token }}
-      run: |
-        for platform in windows-x64 macos-x64 linux-clang-x64; do
-          echo "Downloading results for $platform"
-          gh run download -n "results-$platform" -D "install/bin/results/current/"
-        done
-      shell: bash
-
-    - name: Compare test results
-      run: |
-        echo "Comparing test results..."
-        cd install/bin
-        source env.sh
-        for platform in windows-x64 macos-x64 linux-clang-x64; do
-          ./DRAWEXE -v -c testdiff "results/current/$platform" "results/master/$platform" &
-        done
-        wait
-      shell: bash
-
-    - name: Install BeautifulSoup
-      run: pip install beautifulsoup4
-      shell: bash
-
-    - name: Clean unused test images
-      run: |
-        # copy to the install/bin/results directory
-        cp ${{ github.workspace }}/.github/actions/scripts/cleanup_test_images.py install/bin/results
-        cd install/bin/results
-        python cleanup_test_images.py
-      shell: bash
-
-    - name: Upload comparison results
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: test-compare-results
-        retention-days: 15
-        overwrite: true
-        path: |
-          install/bin/results/**/diff-*.html
-          install/bin/results/**/diff-*.log
-          install/bin/results/**/summary.html
-          install/bin/results/**/tests.log
-          install/bin/results/**/*.png
-
-    - name: Post performance summary to PR
-      if: github.repository == 'Open-Cascade-SAS/OCCT' && github.head_ref == 'IR' && github.base_ref == 'master'
-      env:
-        GH_TOKEN: ${{ github.token }}
-        PR_NUMBER: ${{ github.event.pull_request.number }}
-      run: |
-        COMMENT_FILE=$(mktemp)
-        
-        # Get commit ID and commit header
-        COMMIT_ID=$(git rev-parse HEAD)
-        COMMIT_HEADER=$(git log -1 --pretty=%s)
-        
-        echo -e "**Performance Test Summary**\n" > "$COMMENT_FILE"
-        echo -e "**Commit**: \`${COMMIT_ID}\`\n" >> "$COMMENT_FILE"
-        echo -e "**Title**: ${COMMIT_HEADER}\n" >> "$COMMENT_FILE"
-        
-        LOG_FILES=$(find install/bin/results/current -name "diff-*.log")
-        if [ -z "$LOG_FILES" ]; then
-          echo "No diff logs found." >> "$COMMENT_FILE"
-        else
-          for log_file in $LOG_FILES; do
-            PLATFORM=$(basename $(dirname "$log_file"))
-            echo "**Platform: ${PLATFORM}**" >> "$COMMENT_FILE"
-            echo '```' >> "$COMMENT_FILE"
-            grep -E "Total (MEMORY|CPU|IMAGE) difference:" "$log_file" >> "$COMMENT_FILE" || echo "No performance summary found." >> "$COMMENT_FILE"
-            echo '```' >> "$COMMENT_FILE"
-            echo "" >> "$COMMENT_FILE"
-          done
-        fi
-        gh pr comment ${PR_NUMBER} --body-file "$COMMENT_FILE"
-        rm "$COMMENT_FILE"
-      shell: bash

.github/actions/testgrid/testlinuxclang.tcl

@@ -1,32 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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

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

.github/actions/testgrid/testmacosgcc.tcl

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

.github/actions/testgrid/testwindows.tcl

@@ -1,30 +0,0 @@
-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" \
-    "caf basic W12" \
-    "opengles3 general msaa" \
-    "opengles3 geom interior1" \
-    "opengles3 geom interior2" \
-    "opengles3 shadows dir2" \
-    "opengles3 textures alpha_mask"
-]
-
-set exclude_str [join $exclude_list ,]
-testgrid -exclude {*}$exclude_str -outdir results/windows-x64

.github/actions/testgrid/testwindowsclang.tcl

@@ -1,32 +0,0 @@
-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" \
-    "bugs fclasses bug30775" \
-    "caf basic W12" \
-    "opengles3 general msaa" \
-    "opengles3 geom interior1" \
-    "opengles3 geom interior2" \
-    "opengles3 shadows dir2" \
-    "opengles3 textures alpha_mask"
-]
-
-set exclude_str [join $exclude_list ,]
-testgrid -exclude {*}$exclude_str -outdir results/windows-clang-x64

.github/actions/upload-vcpkg-cache/action.yml

@@ -1,33 +0,0 @@
-name: 'Upload vcpkg Cache'
-description: 'Upload vcpkg installed packages and cache for reuse'
-
-inputs:
-  artifact-name:
-    description: 'Name of the artifact to store vcpkg cache'
-    required: true
-  build-directory:
-    description: 'Build directory containing vcpkg_installed'
-    required: false
-    default: 'build'
-
-runs:
-  using: "composite"
-  steps:
-
-    - name: Create vcpkg tar archive
-      run: |
-        cd ${{ inputs.build-directory }}
-        tar -czf vcpkg-dependencies.tar.gz \
-          --exclude='vcpkg_installed/*/debug' \
-          --exclude='vcpkg_installed/**/*.pdb' \
-          --exclude='vcpkg_installed/**/*.lib' \
-          ./vcpkg_installed/
-      shell: bash
-
-    - name: Upload vcpkg tar archive
-      uses: actions/upload-artifact@v4.6.2
-      with:
-        name: ${{ inputs.artifact-name }}
-        path: ${{ inputs.build-directory }}/vcpkg-dependencies.tar.gz
-        retention-days: 7
-        compression-level: 1

.github/actions/vcpkg-setup/action.yml

@@ -1,110 +0,0 @@
-name: 'Setup vcpkg'
-description: 'Setup vcpkg dependencies for OCCT build on a specific platform'
-
-inputs:
-  vcpkg-tag:
-    description: 'vcpkg tag to checkout'
-    required: false
-    default: '2025.06.13'
-  github-token:
-    description: 'GitHub token for NuGet package access'
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Set environment variables
-      run: |
-        echo "USERNAME=Open-Cascade-SAS" >> $GITHUB_ENV
-        echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $GITHUB_ENV
-        echo "VCPKG_EXE=${{ github.workspace }}/vcpkg/vcpkg" >> $GITHUB_ENV
-        echo "FEED_URL=https://nuget.pkg.github.com/Open-Cascade-SAS/index.json" >> $GITHUB_ENV
-        echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/Open-Cascade-SAS/index.json,readwrite" >> $GITHUB_ENV
-        echo "VCPKG_FEATURE_FLAGS=binarycaching,manifests,versions" >> $GITHUB_ENV
-        echo "VCPKG_DISABLE_COMPILER_TRACKING=1" >> $GITHUB_ENV
-      shell: bash
-      if: runner.os != 'Windows'
-
-    - name: Set environment variables (Windows)
-      run: |
-        echo "USERNAME=Open-Cascade-SAS" >> $env:GITHUB_ENV
-        echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $env:GITHUB_ENV
-        echo "VCPKG_EXE=${{ github.workspace }}/vcpkg/vcpkg" >> $env:GITHUB_ENV
-        echo "FEED_URL=https://nuget.pkg.github.com/Open-Cascade-SAS/index.json" >> $env:GITHUB_ENV
-        echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/Open-Cascade-SAS/index.json,readwrite" >> $env:GITHUB_ENV
-        echo "VCPKG_FEATURE_FLAGS=binarycaching,manifests,versions" >> $env:GITHUB_ENV
-        echo "VCPKG_DISABLE_COMPILER_TRACKING=1" >> $env:GITHUB_ENV
-      shell: pwsh
-      if: runner.os == 'Windows'
-
-    - 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 \
-              libx11-dev \
-              libxi-dev \
-              libxext-dev \
-              mesa-common-dev \
-              libglu1-mesa-dev \
-              libegl1-mesa-dev \
-              libgles2-mesa-dev
-      shell: bash
-
-
-    - name: Install required packages (macOS)
-      if: runner.os == 'macOS'
-      run: |
-        brew update || true
-        brew install cmake ninja nasm autoconf automake mono openexr || true
-        brew install --cask xquartz || true
-      shell: bash
-
-
-    - name: Set up vcpkg (Unix)
-      if: runner.os != 'Windows'
-      run: |
-        git clone https://github.com/microsoft/vcpkg.git
-        cd vcpkg
-        git checkout ${{ inputs.vcpkg-tag }}
-        ./bootstrap-vcpkg.sh
-      shell: bash
-
-    - name: Set up vcpkg (Windows)
-      if: runner.os == 'Windows'
-      run: |
-        git clone https://github.com/microsoft/vcpkg.git
-        cd vcpkg
-        git checkout ${{ inputs.vcpkg-tag }}
-        .\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 "${{ inputs.github-token }}"
-        .$(${{ env.VCPKG_EXE }} fetch nuget) `
-          setapikey "${{ inputs.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 "${{ inputs.github-token }}"
-        mono `${{ env.VCPKG_EXE }} fetch nuget | tail -n 1` \
-          setapikey "${{ inputs.github-token }}" \
-          -Source "${{ env.FEED_URL }}"
-      shell: bash

.github/copilot-instructions.md

@@ -1,247 +0,0 @@
-# OCCT Copilot Instructions
-
-This file provides the comprehensive guidance for AI assistants working with the Open CASCADE Technology (OCCT) C++17+ 3D CAD/CAM/CAE library.
-
----
-
-## 1. Core Directives for AI Assistant
-
-> **IMPORTANT:** These are the most critical rules. Follow them strictly.
-
-1.  **Memory Management is Paramount:**
-    - **ALWAYS** use `Handle(ClassName)` for any class inheriting from `Standard_Transient` (e.g., `Geom_*`, `Poly_*`, `AIS_*`, `V3d_*`). This is for reference-counted objects.
-    - **NEVER** use raw pointers (`ClassName*`) for these types, as it will cause memory leaks.
-    - **Correct:** `Handle(Geom_Circle) aCircle = new Geom_Circle(...);`
-    - **Wrong:** `Geom_Circle* aCircle = new Geom_Circle(...);`
-
-2.  **Check Operation Status:**
-    - After using an API that performs a geometric operation (e.g., `BRepAlgoAPI_Fuse`, `BRepBuilderAPI_MakeEdge`), **ALWAYS** check if the operation was successful using the `IsDone()` method before accessing the result.
-    - **Correct:**
-      ```cpp
-      BRepAlgoAPI_Fuse aFuser(theShape1, theShape2);
-      if (aFuser.IsDone()) {
-          auto aResult = aFuser.Shape();
-      } else {
-          // Handle error
-      }
-      ```
-
-3.  **Strict Naming and File Conventions:**
-    - Adhere to the strict `Package_ClassName` convention.
-    - Place new files in the correct directory: `src/Module/Toolkit/Package/`.
-    - After adding a file, **ALWAYS** update the corresponding `src/Module/Toolkit/FILES.cmake` file.
-
-4.  **Use Modern C++ Idioms:**
-    - Prefer `auto` for variable declarations where the type is clear, especially with iterators.
-    - Use range-based `for` loops and structured bindings where applicable.
-    - Use the modern `TopExp_Explorer` constructor style.
-    - **Correct:** `for (TopExp_Explorer anExp(theShape, TopAbs_FACE); anExp.More(); anExp.Next()) { ... }`
-    - **Wrong:** `for (TopExp_Explorer anExp; anExp.Init(theShape, TopAbs_FACE); anExp.More(); anExp.Next()) { ... }`
-
-5.  **Safe Type Casting:**
-    - When downcasting topological shapes, **ALWAYS** use the `TopoDS` helper functions to avoid errors.
-    - **Correct:** `auto aFace = TopoDS::Face(anExp.Current());`
-    - **Wrong:** `auto aFace = (const TopoDS_Face&)anExp.Current();`
-
-6.  **Handle Downcasting:**
-    - Use `Handle(DerivedClass)::DownCast(BaseHandle)` to safely downcast handles.
-    - **Correct:**
-      ```cpp
-      Handle(Geom_Circle) circ = Handle(Geom_Circle)::DownCast(someCurveHandle);
-      ```
-    - **Wrong:**
-      ```cpp
-      // Do not use C-style casts on handles
-      Geom_Circle* circ = (Geom_Circle*)someHandle.Get();
-      ```
-
-7.  **Validate Handles for Null Safety:**
-    - **ALWAYS** check that a `Handle(ClassName)` is not null before dereferencing it:
-      ```cpp
-      if (!theHandle.IsNull()) {
-          // use theHandle
-      }
-      ```
-
----
-
-## 2. Project Overview
-
-Open CASCADE Technology (OCCT) is a comprehensive C++ software development platform for 3D surface and solid modeling, CAD data exchange, and visualization. It's a modern C++17+ library providing services for CAD/CAM/CAE applications.
-
-### Architecture & Source Organization
-
-- **`src/`**: Source code, organized by a `Module/Toolkit/Package` hierarchy.
-- **`tests/`**: Draw Harness test files, organized by functionality.
-- **`adm/`**: Administrative and build configuration files (CMake).
-- **`samples/`**: Example applications.
-
----
-
-## 3. Code Conventions
-
-### Naming Patterns
-
-| Element Type                | Pattern                      | Example                          |
-| --------------------------- | ---------------------------- | -------------------------------- |
-| **Classes**                 | `Package_ClassName`          | `TopoDS_Shape`, `BRep_Builder`   |
-| **Public Methods**          | `MethodName`                 | `IsDone()`, `Shape()`            |
-| **Private Methods**         | `methodName`                 | `myInternalMethod()`             |
-| **Method Parameters**       | `theParameterName`           | `theShape`, `theTolerance`       |
-| **Local Variables**         | `aVariableName`              | `aBox`, `anExplorer`             |
-| **Class Member Fields**     | `myFieldName`                | `myShape`, `myIsDone`            |
-| **Struct Member Fields**    | `FieldVariableName`          | `Point`, `Value`                 |
-| **Global Variables**        | `THE_GLOBAL_VARIABLE`        | `THE_DEFAULT_PRECISION`          |
-
-### Type Mappings
-
-| OCCT Type           | C++ Equivalent | Notes                               |
-| ------------------- | -------------- | ----------------------------------- |
-| `Standard_Real`     | `double`       | Use for all floating-point numbers. |
-| `Standard_Integer`  | `int`          | Use for all integer values.         |
-| `Standard_Boolean`  | `bool`         | Use for `true`/`false` values.      |
-
-### Modern C++ Encouraged
-This is a C++17+ codebase. Proactively use modern features to improve code quality:
-- `auto`
-- Range-based `for` loops
-- Structured bindings: `for (const auto& [key, value] : aMap)`
-- `std::optional` for optional return values where appropriate.
-- `if constexpr` for compile-time conditions.
-
----
-
-## 4. Step-by-Step Workflow Example: Adding a New Class and Test
-
-This example demonstrates the end-to-end process for adding a new class `BRepTest_MyNewClass` to the `TKTopAlgo` toolkit and creating a corresponding GTest.
-
-**1. Create Header and Source Files:**
-Navigate to the correct package directory and create the files.
-```bash
-# Navigate to the BRepTest package in the ModelingAlgorithms module
-cd src/ModelingAlgorithms/TKTopAlgo/BRepTest
-touch BRepTest_MyNewClass.hxx BRepTest_MyNewClass.cxx
-```
-
-**2. Implement the Class:**
-Add content to `BRepTest_MyNewClass.hxx` and `.cxx`, following all code conventions.
-
-**3. Add Files to CMake:**
-Edit the toolkit's `FILES.cmake` to register the new files.
-```bash
-# Edit the CMake file for TKTopAlgo
-vim src/ModelingAlgorithms/TKTopAlgo/FILES.cmake
-```
-Add the new files to the `OCCT_<PackageName>_FILES` list:
-```cmake
-# In FILES.cmake
-...
-set (OCCT_BRepTest_FILES
-    ...
-    BRepTest_MyNewClass.hxx
-    BRepTest_MyNewClass.cxx
-    ...
-)
-```
-
-**4. Create a GTest:**
-Navigate to the GTest directory for the toolkit and create a test file.
-```bash
-# Navigate to the GTest directory for TKTopAlgo
-cd src/ModelingAlgorithms/TKTopAlgo/GTests
-touch BRepTest_MyNewClass_Test.cxx
-```
-Write the test implementation in the new file.
-
-**5. Add GTest to CMake:**
-Edit the same `FILES.cmake` to add the test file.
-```cmake
-# In FILES.cmake
-...
-set (OCCT_TKTopAlgo_GTests_FILES
-    ...
-    GTests/BRepTest_MyNewClass_Test.cxx
-    ...
-)
-```
-
-**6. Build and Run Test:**
-From the `build` directory, build the project and run the tests.
-```bash
-# Navigate to build directory
-cd build
-
-# Re-run CMake to pick up new files (usually not needed, but good practice)
-cmake .. -DBUILD_GTEST=ON
-
-# Build the project
-cmake --build . --config Release
-
-# Run the tests
-./bin/OpenCascadeGTest --gtest_filter=*MyNewClass*
-```
-
----
-
-## 5. Build and Test System
-
-### Build System (CMake)
-- **Primary build system:** CMake 3.16+ recommended.
-- **Build Directory:** Always build in a separate directory (e.g., `build/`).
-- **Quick Build:**
-  ```bash
-  mkdir -p build && cd build
-  cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_GTEST=ON
-  cmake --build . --config Release --parallel
-  ```
-- **Environment:** Before running any OCCT executable (including tests), you **must** source the environment script: `source build/env.sh` (or `build\env.bat` on Windows).
-
-### Testing Frameworks
-- **Draw Harness:** Tcl-based framework for interactive testing. Located in `tests/`. Run with `build/DRAWEXE`.
-- **GTest:** C++ unit testing framework. Tests are located in `src/.../GTests/`. Enable with `-DBUILD_GTEST=ON`.
-
----
-
-## 6. Common Patterns & Key Packages
-
-### Common Operations
-
-- **Shape Creation:** Use `BRepPrimAPI_` classes (`MakeBox`, `MakeCylinder`).
-- **Boolean Operations:** Use `BRepAlgoAPI_` classes (`Fuse`, `Cut`, `Common`).
-- **Shape Exploration:** Use `TopExp_Explorer`.
-- **Transformations:** Use `gp_Trsf` and `BRepBuilderAPI_Transform`.
-
-### Key Packages
-
-| Package     | Purpose                               | Module                |
-| ----------- | ------------------------------------- | --------------------- |
-| `gp`        | Geometric Primitives (Points, Vecs)   | FoundationClasses     |
-| `Geom`      | Geometric entities (Curves, Surfaces) | ModelingData          |
-| `TopoDS`    | Topological Data Structures (Shapes)  | ModelingData          |
-| `TopExp`    | Exploring topological shapes          | ModelingData          |
-| `BRepAlgoAPI` | High-level modeling algorithms      | ModelingAlgorithms    |
-| `BRepPrimAPI` | Geometric primitives creation       | ModelingAlgorithms    |
-| `AIS`       | Application Interactive Services      | Visualization         |
-
-### Common Headers
-```cpp
-#include <Standard_Failure.hxx>
-#include <Handle_Geom_Circle.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Trsf.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopExp_Explorer.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <BRepPrimAPI_MakeBox.hxx>
-```
-
----
-
-## 7. Key Files & Platform Notes
-
-- **`adm/MODULES`**: Defines all modules and toolkits.
-- **`src/*/FILES.cmake`**: Lists all source/header files for a toolkit. **You must edit this when adding/removing files.**
-- **`build/env.sh/bat`**: The crucial environment script.

.github/workflows/build-docs.yml

@@ -0,0 +1,45 @@
+# 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/code-analysis.yml

@@ -0,0 +1,97 @@
+# This workflow performs code analysis using both CodeQL and Microsoft C++ Code Analysis.
+# It is triggered on pushes to the 'master' branch and publishes warnings into the security GitHub tab.
+# The workflow includes two jobs: one for CodeQL analysis on Ubuntu and another for MSVC Code Analysis on Windows.
+
+name: Code Analysis
+
+on:
+  push:
+    branches:
+      - 'master'
+
+permissions:
+  contents: read
+  security-events: write
+  packages: read
+
+env:
+  # Path to the CMake build directory.
+  build: '${{ github.workspace }}/build'
+  config: 'Debug'
+
+jobs:
+  codeql-analyze:
+    name: CodeQL Analyze (C/C++)
+    runs-on: ubuntu-latest
+
+    steps:
+    # Step: Checkout the repository
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.7
+
+    # Step: Install necessary dependencies for building the project
+    - 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
+
+    # Step: Initialize CodeQL for scanning
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3.26.5
+      with:
+        languages: c-cpp
+        build-mode: manual
+
+    # Step: Build the project using CMake and Make
+    - name: Build project
+      shell: bash
+      run: |
+        mkdir -p build
+        cd build
+        cmake -G "Unix Makefiles" \
+              -D CMAKE_C_COMPILER=gcc \
+              -D CMAKE_CXX_COMPILER=g++ \
+              -D USE_FREETYPE=OFF \
+              -D CMAKE_BUILD_TYPE=Release ..
+        make -j$(nproc)
+
+    # Step: Perform CodeQL Analysis
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3.26.5
+      with:
+        category: "/language:c-cpp"
+
+  msvc-analyze:
+    name: Microsoft C++ Code Analysis
+    runs-on: windows-latest
+
+    steps:
+    # Step: Checkout the repository
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.7
+
+    # Step: Install necessary dependencies using Chocolatey
+    - name: Install dependencies
+      run: |
+          choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
+          choco install magicsplat-tcl-tk -y
+
+    # Step: Configure the project using CMake
+    - name: Configure CMake
+      run: |
+        mkdir build
+        cd build
+        cmake -D USE_FREETYPE=OFF -DCMAKE_BUILD_TYPE=${{ env.config }} ..
+
+    # Step: Run MSVC Code Analysis
+    - name: Run MSVC Code Analysis
+      uses: microsoft/msvc-code-analysis-action@v0.1.1
+      id: run-analysis
+      with:
+        cmakeBuildDirectory: ${{ env.build }}
+        buildConfiguration: ${{ env.config }}
+        ruleset: NativeRecommendedRules.ruleset
+
+    # Step: Upload SARIF file to GitHub Code Scanning Alerts
+    - name: Upload SARIF to GitHub
+      uses: github/codeql-action/upload-sarif@v3.26.5
+      with:
+        sarif_file: ${{ steps.run-analysis.outputs.sarif }}

.github/workflows/daily-ir-vcpkg-configure.yml

@@ -1,81 +0,0 @@
-# This workflow runs daily on the IR branch to configure OCCT with vcpkg packages.
-# It only performs configuration without building or installing, using vcpkg for dependency management.
-
-name: Daily IR Branch vcpkg Configure
-
-on:
-  schedule:
-    # Run daily at 02:00 UTC
-    - cron: '0 2 * * *'
-  workflow_dispatch:
-    # Allow manual triggering
-
-jobs:
-  configure-windows:
-    name: Configure OCCT on Windows with MSVC
-    runs-on: windows-2025
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.2
-      with:
-        ref: IR
-
-    - name: Configure OCCT
-      uses: ./.github/actions/configure-occt
-      with:
-        platform: windows
-        compiler: msvc
-        cmake-build-type: Release
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Verify configuration output
-      run: |
-        echo "::notice::Successfully configured OCCT on Windows with vcpkg packages"
-
-  configure-macos:
-    name: Configure OCCT on macOS with Clang
-    runs-on: macos-15
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.2
-      with:
-        ref: IR
-
-    - name: Configure OCCT
-      uses: ./.github/actions/configure-occt
-      with:
-        platform: macos
-        compiler: clang
-        cmake-build-type: Release
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Verify configuration output
-      run: |
-        echo "::notice::Successfully configured OCCT on macOS with vcpkg packages"
-
-  configure-linux:
-    name: Configure OCCT on Ubuntu with Clang
-    runs-on: ubuntu-24.04
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.2
-      with:
-        ref: IR
-
-    - name: Configure OCCT
-      uses: ./.github/actions/configure-occt
-      with:
-        platform: linux
-        compiler: clang
-        cmake-build-type: Release
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Verify configuration output
-      run: |
-        echo "::notice::Successfully configured OCCT on Linux with vcpkg packages"

.github/workflows/master-validation.yml

@@ -1,297 +0,0 @@
-# Master validation workflow that combines multiple build configurations
-# This workflow is triggered only on pushes to the master branch of the main repository
-# It includes Windows (MSVC, MinGW), Ubuntu, vcpkg builds, and code analysis
-
-name: Master Validation
-
-on:
-  push:
-    branches:
-      - master
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  # Windows MSVC/Clang builds
-  windows-msvc:
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-    name: Windows MSVC/Clang validation
-    runs-on: windows-2025
-    
-    strategy:
-      fail-fast: false
-      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 -Wno-error=cast-function-type-mismatch",
-              cxx_flags: "-Werror -Wall -Wextra -Wno-unknown-warning-option -Wno-error=cast-function-type-mismatch"
-            }
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.2
-
-    - name: Setup Windows MSVC dependencies
-      uses: ./.github/actions/setup-windows-msvc-deps
-
-    - name: Build basic configuration
-      uses: ./.github/actions/cmake-build-basic
-      with:
-        generator: ${{ matrix.config.generator }}
-        cc: ${{ matrix.config.cc }}
-        cxx: ${{ matrix.config.cxx }}
-        build-type: "Release"
-        thirdparty-dir: ${{ github.workspace }}/3rdparty-vc14-64
-        compiler-flags: "${{ matrix.config.toolset != '' && format('-T {0}', matrix.config.toolset) || '' }} -D CMAKE_CXX_FLAGS=\"${{ matrix.config.cxx_flags }}\" -D CMAKE_C_FLAGS=\"${{ matrix.config.c_flags }}\""
-
-    - name: Build full shared configuration
-      uses: ./.github/actions/cmake-build-full
-      with:
-        generator: ${{ matrix.config.generator }}
-        cc: ${{ matrix.config.cc }}
-        cxx: ${{ matrix.config.cxx }}
-        build-type: "Debug"
-        library-type: "Shared"
-        opt-profile: "Production"
-        thirdparty-dir: ${{ github.workspace }}/3rdparty-vc14-64
-        compiler-flags: "${{ matrix.config.toolset != '' && format('-T {0}', matrix.config.toolset) || '' }} -D CMAKE_CXX_FLAGS=\"${{ matrix.config.cxx_flags }}\" -D CMAKE_C_FLAGS=\"${{ matrix.config.c_flags }}\" -D USE_FFMPEG=ON"
-        use-vtk: ${{ matrix.config.name == 'MSVC' && 'ON' || 'OFF' }}
-        use-tbb: "ON"
-
-  # Windows MinGW builds
-  windows-mingw:
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-    name: Windows MinGW validation
-    runs-on: windows-2025
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-              name: "GCC",
-              cc: "x86_64-w64-mingw32-gcc",
-              cxx: "x86_64-w64-mingw32-g++",
-              package: "mingw-w64-x86_64-toolchain",
-              msystem: "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",
-              msystem: "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"
-            }
-        build_type: [Debug, Release]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.2
-
-    - name: Setup MSYS2
-      uses: ./.github/actions/setup-msys2
-      with:
-        msystem: ${{ matrix.config.msystem }}
-        packages: ${{ matrix.config.package }}
-        dependencies: ${{ matrix.config.dependencies }}
-
-    - name: Build basic configuration
-      uses: ./.github/actions/cmake-build-basic
-      with:
-        generator: "Ninja"
-        cc: ${{ matrix.config.cc }}
-        cxx: ${{ matrix.config.cxx }}
-        build-type: ${{ matrix.build_type }}
-        shell-type: "msys2"
-        compiler-flags: ${{ matrix.config.compiler_flags }}
-
-    - name: Build full shared configuration
-      uses: ./.github/actions/cmake-build-full
-      with:
-        generator: "Ninja"
-        cc: ${{ matrix.config.cc }}
-        cxx: ${{ matrix.config.cxx }}
-        build-type: ${{ matrix.build_type }}
-        library-type: "Shared"
-        opt-profile: "Production"
-        shell-type: "msys2"
-        compiler-flags: ${{ matrix.config.compiler_flags }}
-        use-vtk: "OFF"
-        use-tbb: "OFF"
-
-  # Ubuntu builds
-  ubuntu:
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-    name: Ubuntu validation
-    runs-on: ubuntu-24.04
-
-    strategy:
-      fail-fast: false
-      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.2.2
-
-    - name: Setup Ubuntu dependencies
-      uses: ./.github/actions/setup-ubuntu-deps
-
-    - name: Build basic configuration
-      uses: ./.github/actions/cmake-build-basic
-      with:
-        generator: "Ninja"
-        cc: ${{ matrix.config.cc }}
-        cxx: ${{ matrix.config.cxx }}
-        build-type: ${{ matrix.build_type }}
-        compiler-flags: ${{ matrix.config.compiler_flags }}
-
-    - name: Build full shared configuration
-      uses: ./.github/actions/cmake-build-full
-      with:
-        generator: "Ninja"
-        cc: ${{ matrix.config.cc }}
-        cxx: ${{ matrix.config.cxx }}
-        build-type: ${{ matrix.build_type }}
-        library-type: "Shared"
-        opt-profile: "Production"
-        compiler-flags: ${{ matrix.config.compiler_flags }}
-        rapidjson-dir: ${{ github.workspace }}/rapidjson-858451e5b7d1c56cf8f6d58f88cf958351837e53
-        use-vtk: "ON"
-        use-tbb: "ON"
-
-  # vcpkg builds
-  vcpkg:
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-    name: vcpkg validation
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-24.04, ubuntu-22.04, windows-2022, windows-2025, macos-15, macos-14]
-        build_type: [Debug, Release]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.2
-
-    - name: Build OCCT with vcpkg
-      uses: ./.github/actions/build-occt
-      with:
-        platform: ${{ runner.os == 'Windows' && 'windows' || runner.os == 'macOS' && 'macos' || 'linux' }}
-        compiler: ${{ runner.os == 'Windows' && 'msvc' || 'clang' }}
-        artifact-name: occt-${{ matrix.os }}-${{ matrix.build_type }}
-        cmake-build-type: ${{ matrix.build_type }}
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-  # Code analysis
-  codeql-analyze:
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-    name: CodeQL Analyze (C/C++)
-    runs-on: ubuntu-24.04
-
-    permissions:
-      contents: read
-      security-events: write
-      packages: read
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.2
-
-    - 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
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.26.5
-      with:
-        languages: c-cpp
-        build-mode: manual
-
-    - name: Build project for analysis
-      uses: ./.github/actions/cmake-build-basic
-      with:
-        generator: "Unix Makefiles"
-        cc: "gcc"
-        cxx: "g++"
-        build-type: "Release"
-        compiler-flags: "-D USE_FREETYPE=OFF"
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.26.5
-      with:
-        category: "/language:c-cpp"
-
-  msvc-analyze:
-    if: github.repository == 'Open-Cascade-SAS/OCCT'
-    name: Microsoft C++ Code Analysis
-    runs-on: windows-2025
-
-    permissions:
-      contents: read
-      security-events: write
-      packages: read
-
-    env:
-      build: '${{ github.workspace }}/build'
-      config: 'Debug'
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.2
-
-    - name: Configure OCCT for analysis
-      uses: ./.github/actions/configure-occt
-      with:
-        platform: 'windows'
-        compiler: 'msvc'
-        build-use-pch: 'false'
-        cmake-build-type: ${{ env.config }}
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Run MSVC Code Analysis
-      uses: microsoft/msvc-code-analysis-action@v0.1.1
-      id: run-analysis
-      with:
-        cmakeBuildDirectory: ${{ env.build }}
-        buildConfiguration: ${{ env.config }}
-        ruleset: NativeRecommendedRules.ruleset
-
-    - name: Upload SARIF to GitHub
-      uses: github/codeql-action/upload-sarif@v3.26.5
-      with:
-        sarif_file: ${{ steps.run-analysis.outputs.sarif }}

.gitignore

@@ -54,20 +54,4 @@ win64
 /libtool
 /stamp*
 /build*
-/install*
-/tools/build*
-
-# Coding agents instructions (keep .github/copilot-instructions.md)
-/.CLAUDE.md
-/.AGENT.md
-/.GEMINI.md
-/.COPILOT.md
-/.CURSOR.md
-/.CODEIUM.md
-/.TABNINE.md
-/.CHATGPT.md
-/.BARD.md
-/.PERPLEXITY.md
-/.CONTINUE.md
-/.AIDER.md
-/.WINDSURF.md
+/install

README.md

@@ -28,27 +28,26 @@ 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.8](https://dev.opencascade.org/doc/occt-7.8.0/overview)
+- [Version 7.7](https://dev.opencascade.org/doc/occt-7.7.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 `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).
+- **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`.
 
-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.
+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.
 
 ## 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/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.
+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.
 
 ## Version
 
-The current version of OCCT can be found in the file [`adm/cmake/version.cmake`](adm/cmake/version.cmake).
+The current version of OCCT can be found in the file `src/Standard/Standard_Version.hxx`.
 
 ## Development
 

adm/MODULES

@@ -1,7 +1,8 @@
 FoundationClasses TKernel TKMath
 ModelingData TKG2d TKG3d TKGeomBase TKBRep
-ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing TKExpress
+ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
 Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
 ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
 DataExchange TKDE TKXSBase TKDESTEP TKDEIGES TKDESTL TKDEVRML TKDECascade TKDEOBJ TKDEGLTF TKDEPLY TKXCAF TKXmlXCAF TKBinXCAF TKRWMesh
+DETools TKExpress ExpToCasExe
 Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE TKXSDRAWDE TKXSDRAWGLTF TKXSDRAWIGES TKXSDRAWOBJ TKXSDRAWPLY TKXSDRAWSTEP TKXSDRAWSTL TKXSDRAWVRML

adm/TOOLS

@@ -0,0 +1,4 @@
+TModelingData TKShapeView TKMessageModel TKMessageView
+TVisualization TKView TKVInspector
+TApplicationFramework TKTreeModel TKTInspectorAPI TKDFBrowser
+TTool TKTInspector TKToolsDraw TInspectorEXE

adm/UDLIST

@@ -0,0 +1,497 @@
+n NCollection
+n BSplCLib
+n BSplSLib
+n Bnd
+n BVH
+n CSLib
+n Convert
+n ElCLib
+n ElSLib
+n Expr
+n ExprIntrp
+n FSD
+n GeomAbs
+n Message
+n OSD
+n PLib
+n Plugin
+n Poly
+n Precision
+n Quantity
+n Resource
+n Standard
+n StdFail
+n Storage
+n TColStd
+n TColgp
+n TCollection
+n TShort
+n TopLoc
+n Units
+n UnitsAPI
+n gp
+n math
+r OS
+n FlexLexer
+t TKMath
+t TKernel
+n Adaptor2d
+n Adaptor3d
+n AdvApp2Var
+n AdvApprox
+n AppCont
+n AppDef
+n AppParCurves
+n Approx
+n BRep
+n BRepAdaptor
+n BRepLProp
+n BRepTools
+n BndLib
+n CPnts
+n Extrema
+n FEmTool
+n GC
+n GCE2d
+n GCPnts
+n GProp
+n Geom
+n Geom2d
+n Geom2dAdaptor
+n Geom2dConvert
+n Geom2dLProp
+n GeomAdaptor
+n GeomConvert
+n GeomLProp
+n GeomLib
+n GeomProjLib
+n GeomTools
+n GeomEvaluator
+n Hermit
+n IntAna
+n IntAna2d
+n LProp
+n LProp3d
+n ProjLib
+n TColGeom
+n TColGeom2d
+n TopAbs
+n TopExp
+n TopTools
+n TopoDS
+n gce
+t TKBRep
+t TKG2d
+t TKG3d
+t TKGeomBase
+n AppBlend
+n ApproxInt
+n BOPTools
+n BRepAlgo
+n BRepAlgoAPI
+n BRepApprox
+n BRepBlend
+n BRepBndLib
+n BRepBuilderAPI
+n BRepCheck
+n BRepClass
+n BRepClass3d
+n BRepExtrema
+n BRepFeat
+n BRepFill
+n BRepFilletAPI
+n BRepGProp
+n BRepIntCurveSurface
+n BRepLib
+n BRepMAT2d
+n BRepMesh
+n BRepMeshData
+n BRepOffset
+n BRepOffsetAPI
+n BRepPreviewAPI
+n BRepPrim
+n BRepPrimAPI
+n BRepProj
+n BRepSweep
+n BRepTopAdaptor
+n BiTgte
+n Bisector
+n Blend
+n BlendFunc
+n ChFi2d
+n ChFi3d
+n ChFiDS
+n ChFiKPart
+n Contap
+n Draft
+n FairCurve
+n FilletSurf
+n GccAna
+n GccEnt
+n GccInt
+n Geom2dAPI
+n Geom2dGcc
+n Geom2dHatch
+n Geom2dInt
+n GeomAPI
+n GeomFill
+n GeomInt
+n GeomPlate
+n HLRAlgo
+n HLRBRep
+n HLRTopoBRep
+n HLRAppli
+n Hatch
+n HatchGen
+n IMeshData
+n IMeshTools
+n IntCurve
+n IntCurveSurface
+n IntCurvesFace
+n IntImp
+n IntImpParGen
+n IntPatch
+n IntPolyh
+n IntRes2d
+n IntStart
+n IntSurf
+n IntTools
+n IntWalk
+n Intf
+n Intrv
+n Law
+n LocOpe
+n LocalAnalysis
+n MAT
+n MAT2d
+n NLPlate
+n Plate
+n ShapeAlgo
+n ShapeAnalysis
+n ShapeBuild
+n ShapeConstruct
+n ShapeCustom
+n ShapeExtend
+n ShapeFix
+n ShapeProcess
+n ShapeProcessAPI
+n ShapeUpgrade
+n Sweep
+n TopBas
+n TopClass
+n TopCnx
+n TopOpeBRep
+n TopOpeBRepBuild
+n TopOpeBRepDS
+n TopOpeBRepTool
+n TopTrans
+n XBRepMesh
+t TKBO
+t TKBool
+t TKFeat
+t TKFillet
+t TKGeomAlgo
+t TKHLR
+t TKMesh
+t TKOffset
+t TKPrim
+t TKShHealing
+t TKTopAlgo
+t TKXMesh
+n AIS
+n Aspect
+n DsgPrs
+n PrsDim
+n Graphic3d
+n Image
+n Media
+n MeshVS
+n OpenGl
+n OpenGles
+n D3DHost
+n Prs3d
+n PrsMgr
+n Select3D
+n SelectBasics
+n SelectMgr
+n StdPrs
+n StdSelect
+n V3d
+n Wasm
+n WNT
+n Xw
+n Cocoa
+r Textures
+r Shaders
+r XRResources
+t TKMeshVS
+t TKOpenGl
+t TKOpenGles
+t TKD3DHost
+t TKService
+t TKV3d
+n BinTObjDrivers
+n LDOM
+n TObj
+n XmlTObjDrivers
+n AppStd
+n AppStdL
+n BinDrivers
+n BinLDrivers
+n BinMDF
+n BinMDataStd
+n BinMDataXtd
+n BinMDocStd
+n BinMFunction
+n BinMNaming
+n BinObjMgt
+n BinTools
+n CDF
+n CDM
+n PCDM
+n StdLDrivers
+n StdLPersistent
+n StdObjMgt
+n StdDrivers
+n StdObject
+n StdPersistent
+n StdStorage
+n ShapePersistent
+n TDF
+n TDataStd
+n TDataXtd
+n TDocStd
+n TFunction
+n TNaming
+n TPrsStd
+n UTL
+n XmlDrivers
+n XmlLDrivers
+n XmlMDF
+n XmlMDataStd
+n XmlMDataXtd
+n XmlMDocStd
+n XmlMFunction
+n XmlMNaming
+n XmlObjMgt
+r StdResource
+r XmlOcafResource
+
+t TKBin
+t TKBinL
+t TKBinTObj
+t TKCAF
+t TKCDF
+t TKLCAF
+
+t TKStdL
+t TKStd
+t TKTObj
+t TKXml
+t TKXmlL
+t TKXmlTObj
+n IGESFile
+n StepFile
+n APIHeaderSection
+n BRepToIGES
+n BRepToIGESBRep
+n BinMXCAFDoc
+n BinXCAFDrivers
+n Geom2dToIGES
+n GeomToIGES
+n GeomToStep
+n HeaderSection
+n IFGraph
+n IFSelect
+n IGESAppli
+n IGESBasic
+n IGESCAFControl
+n IGESControl
+n IGESConvGeom
+n IGESData
+n IGESDefs
+n IGESDimen
+n IGESDraw
+n IGESGeom
+n IGESGraph
+n IGESSelect
+n IGESSolid
+n IGESToBRep
+n Interface
+n LibCtl
+n MoniTool
+n RWHeaderSection
+n RWStepAP203
+n RWStepAP214
+n RWStepAP242
+n RWStepBasic
+n RWStepDimTol
+n RWStepElement
+n RWStepFEA
+n RWStepGeom
+n RWStepKinematics
+n RWStepRepr
+n RWStepShape
+n RWStepVisual
+n RWStl
+n STEPCAFControl
+n STEPConstruct
+n STEPControl
+n STEPEdit
+n STEPSelections
+n StepAP203
+n StepAP209
+n StepAP214
+n StepAP242
+n StepBasic
+n StepData
+n StepDimTol
+n StepElement
+n StepFEA
+n StepGeom
+n StepKinematics
+n StepRepr
+n StepSelect
+n StepShape
+n StepToGeom
+n StepToTopoDS
+n StepVisual
+n StlAPI
+n TopoDSToStep
+n Transfer
+n TransferBRep
+n UnitsMethods
+n Vrml
+n VrmlAPI
+n VrmlConverter
+n VrmlData
+n XCAFApp
+n XCAFDimTolObjects
+n XCAFDoc
+n XCAFPrs
+n XSAlgo
+n XSControl
+n XmlMXCAFDoc
+n XmlXCAFDrivers
+r SHMessage
+r XSMessage
+r XSTEPResource
+t TKBinXCAF
+t TKDESTL
+t TKDEVRML
+t TKXCAF
+t TKDE
+t TKDECascade
+t TKDEIGES
+t TKDESTEP
+t TKXSBase
+t TKXmlXCAF
+n BOPTest
+n BRepTest
+n DBRep
+n DDF
+n DDataStd
+n DDocStd
+n DE
+n DEXCAFCascade
+n DEBRepCascade
+n DNaming
+n DPrsStd
+n Draw
+n DrawDim
+n DrawFairCurve
+n DrawTrSurf
+n GeometryTest
+n GeomliteTest
+n HLRTest
+n MeshTest
+n SWDRAW
+n TObjDRAW
+n OpenGlTest
+n OpenGlesTest
+n D3DHostTest
+n ViewerTest
+n XDEDRAW
+n XSDRAW
+n XSDRAWIGES
+n XSDRAWSTEP
+n XSDRAWSTL
+n XSDRAWVRML
+n XSDRAWDE
+n XSDRAWGLTF
+n XSDRAWOBJ
+n XSDRAWPLY
+r DrawResources
+t TKDCAF
+t TKDraw
+t TKTObjDRAW
+t TKTopTest
+t TKOpenGlTest
+t TKOpenGlesTest
+t TKD3DHostTest
+t TKViewerTest
+t TKXDEDRAW
+t TKXSDRAW
+t TKXSDRAWIGES
+t TKXSDRAWSTEP
+t TKXSDRAWSTL
+t TKXSDRAWVRML
+t TKXSDRAWDE
+t TKXSDRAWGLTF
+t TKXSDRAWOBJ
+t TKXSDRAWPLY
+x DRAWEXE
+n QADraw
+n QANCollection
+n QANewBRepNaming
+n QANewDBRepNaming
+n QANewModTopOpe
+t TKQADraw
+n QADNaming
+n QABugs
+n Font
+n BOPAlgo
+n BOPDS
+n BOPCol
+n IVtk
+n IVtkOCC
+n IVtkVTK
+n IVtkTools
+t TKIVtk
+n IVtkDraw
+t TKIVtkDraw
+n Geom2dEvaluator
+t TKVCAF
+n XCAFView
+n XCAFNoteObjects
+t TKRWMesh
+t TKDEGLTF
+t TKDEOBJ
+t TKDEPLY
+n RWGltf
+n RWMesh
+n RWObj
+n RWPly
+n DFBrowser
+n DFBrowserPane
+n DFBrowserPaneXDE
+n ShapeView
+n TInspector
+n TInspectorAPI
+x TInspectorEXE
+t TKDFBrowser
+t TKShapeView
+t TKTInspector
+t TKTInspectorAPI
+t TKToolsDraw
+t TKTreeModel
+t TKView
+t TKVInspector
+n ToolsDraw
+n TreeModel
+n View
+n ViewControl
+n VInspector
+n Express
+t TKExpress
+x ExpToCasExe

adm/cmake/3rdparty_macro.cmake

@@ -6,6 +6,137 @@ endif()
 set(3RDPARTY_MACRO_ALREADY_INCLUDED 1)
 
 
+macro(THIRDPARTY_PRODUCT_LIBRARY PRODUCT_NAME LIBRARY_CSF_NAME LIBRARY_PATH_DEBUG_SUFFIX VARIABLE_DEBUG_SUFFIX)
+  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+
+  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+    string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+#    if (BUILD_SHARED_LIBS)
+      # library
+      if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}")
+        set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+
+        set (${PRODUCT_NAME}_PATH_SUFFIXES lib${LIBRARY_PATH_DEBUG_SUFFIX})
+        if (WIN32)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} win${COMPILER_BITNESS}/${COMPILER}/lib${LIBRARY_PATH_DEBUG_SUFFIX})
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib${LIBRARY_PATH_DEBUG_SUFFIX}/win${COMPILER_BITNESS})
+        endif()
+        if (ANDROID)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
+        endif()
+        if(UNIX AND NOT APPLE AND NOT ANDROID)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/linux${COMPILER_BITNESS})
+        endif()
+
+        # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+
+        if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}${VARIABLE_DEBUG_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}${VARIABLE_DEBUG_SUFFIX}}"))
+          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} NAMES ${LIBRARY_NAME}
+                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}${VARIABLE_DEBUG_SUFFIX}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                                                CMAKE_FIND_ROOT_PATH_BOTH
+                                                                                NO_DEFAULT_PATH)
+          if ("${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}-NOTFOUND")
+            # find directory recursive
+            FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} "${${PRODUCT_NAME}_PATH_SUFFIXES}" SUBDIR_NAME)
+            if (NOT "${SUBDIR_NAME}" STREQUAL "")
+              find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
+                                                           PATHS "${SUBDIR_NAME}"
+                                                           PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                           CMAKE_FIND_ROOT_PATH_BOTH
+                                                           NO_DEFAULT_PATH)
+            endif()
+          endif()
+        else()
+          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} NAMES ${LIBRARY_NAME}
+                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                                                CMAKE_FIND_ROOT_PATH_BOTH)
+        endif()
+
+        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}")
+          get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}" PATH)
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        else()
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        endif()
+      endif()
+
+      if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}")
+        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}")
+      else()
+        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX})
+
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+      endif()
+
+      # shared library
+      if (WIN32)
+        if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
+
+          set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+
+          # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+
+          if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}${VARIABLE_DEBUG_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}${VARIABLE_DEBUG_SUFFIX}}"))
+            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}  NAMES ${LIBRARY_NAME}
+                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}${VARIABLE_DEBUG_SUFFIX}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                               PATH_SUFFIXES bin${LIBRARY_PATH_DEBUG_SUFFIX} win${COMPILER_BITNESS}/${COMPILER}/bin${LIBRARY_PATH_DEBUG_SUFFIX} bin${LIBRARY_PATH_DEBUG_SUFFIX}/win${COMPILER_BITNESS}
+                                                                               NO_DEFAULT_PATH)
+            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}-NOTFOUND")
+              # find directory recursive
+              FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} bin${LIBRARY_PATH_DEBUG_SUFFIX} SUBDIR_NAME)
+              if (NOT "${SUBDIR_NAME}" STREQUAL "")
+                find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
+                                                             PATHS "${SUBDIR_NAME}"
+                                                             PATH_SUFFIXES bin${LIBRARY_PATH_DEBUG_SUFFIX}
+                                                             NO_DEFAULT_PATH)
+              endif()
+            endif()
+          else()
+            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} NAMES ${LIBRARY_NAME} PATH_SUFFIXES bin${LIBRARY_PATH_DEBUG_SUFFIX})
+          endif()
+
+          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}")
+            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}" PATH)
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+          else()
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+          endif()
+        endif()
+
+        if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}")
+          list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX}}")
+        else()
+          list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX})
+        endif()
+      endif()
+
+      if (WIN32)
+        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS${VARIABLE_DEBUG_SUFFIX} "")
+      else()
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS${VARIABLE_DEBUG_SUFFIX} "")
+      endif()
+
+      foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+        string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+        if (WIN32)
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS${VARIABLE_DEBUG_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${3RDPARTY_${PRODUCT_NAME}_DLL_DIRS}")
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS${VARIABLE_DEBUG_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
+        else()
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS${VARIABLE_DEBUG_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS}")
+        endif()
+      endforeach()
+
+      mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}${VARIABLE_DEBUG_SUFFIX})
+#    endif()
+  endforeach()
+endmacro()
+
 macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME_DEBUG_SUFFIX)
 
   if (NOT DEFINED INSTALL_${PRODUCT_NAME} AND BUILD_SHARED_LIBS)
@@ -53,12 +184,27 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
         if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}")
           set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
         endif()
-      endif()
 
-      if (WIN32)
         if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME})
           set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}             "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
         endif()
+
+        #Debug
+        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}_DEBUG OR NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}_DEBUG OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}_DEBUG}")
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}_DEBUG       "" CACHE FILEPATH "${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        endif()
+
+        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}_DEBUG)
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}_DEBUG   "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+        endif()
+
+        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}_DEBUG OR NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}_DEBUG OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}_DEBUG}")
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}_DEBUG           "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+        endif()
+
+        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}_DEBUG)
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}_DEBUG       "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
+        endif()
       endif()
     endif()
 
@@ -84,6 +230,25 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
           else()
             CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
           endif()
+
+          #Debug
+          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}_DEBUG FILEPATH "the path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+
+          if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}_DEBUG AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}_DEBUG}")
+            get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}_DEBUG "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}_DEBUG}" PATH)
+            set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}_DEBUG "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}_DEBUG}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+          else()
+            CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}_DEBUG PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+          endif()
+
+          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}_DEBUG FILEPATH "the path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
+
+          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}_DEBUG AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}_DEBUG}")
+            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}_DEBUG "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}_DEBUG}" PATH)
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}_DEBUG "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}_DEBUG}" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+          else()
+            CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}_DEBUG PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
+          endif()
         endif()
       endif()
     endif()
@@ -116,192 +281,97 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
     set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The path to ${HEADER_NAME}" FORCE)
   endif()
 
-  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-    string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${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 .dll.a .lib .so .dylib .a)
-
-        set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
-        if (WIN32)
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} win${COMPILER_BITNESS}/${COMPILER}/lib)
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/win${COMPILER_BITNESS})
-        endif()
-        if (ANDROID)
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
-        endif()
-        if(UNIX AND NOT APPLE AND NOT ANDROID)
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/linux${COMPILER_BITNESS})
-        endif()
-
-        # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-
-        if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
-          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
-                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                                                CMAKE_FIND_ROOT_PATH_BOTH
-                                                                                NO_DEFAULT_PATH)
-          if ("${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
-            # find directory recursive
-            FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} "${${PRODUCT_NAME}_PATH_SUFFIXES}" SUBDIR_NAME)
-            if (NOT "${SUBDIR_NAME}" STREQUAL "")
-              find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
-                                                           PATHS "${SUBDIR_NAME}"
-                                                           PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                           CMAKE_FIND_ROOT_PATH_BOTH
-                                                           NO_DEFAULT_PATH)
-            endif()
-          endif()
-        else()
-          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
-                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                                                CMAKE_FIND_ROOT_PATH_BOTH)
-        endif()
-
-        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
-          get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" PATH)
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-        else()
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-        endif()
+  THIRDPARTY_PRODUCT_LIBRARY (${PRODUCT_NAME} ${LIBRARY_CSF_NAME} ""  "")
+  if (NOT SINGLE_GENERATOR)
+    THIRDPARTY_PRODUCT_LIBRARY (${PRODUCT_NAME} ${LIBRARY_CSF_NAME} "d" "_DEBUG")
+    foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+      string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+      if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}_DEBUG)
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}_DEBUG "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
       endif()
 
-      if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
-        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
-      else()
-        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX})
-
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-      endif()
-
-      # shared library
-      if (WIN32)
-        if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
-
-          set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-
-          # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
-          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-
-          if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
-            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
-                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                                               PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin bin/win${COMPILER_BITNESS}
-                                                                               NO_DEFAULT_PATH)
-            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
-              # find directory recursive
-              FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} bin SUBDIR_NAME)
-              if (NOT "${SUBDIR_NAME}" STREQUAL "")
-                find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
-                                                             PATHS "${SUBDIR_NAME}"
-                                                             PATH_SUFFIXES bin
-                                                             NO_DEFAULT_PATH)
-              endif()
-            endif()
-          else()
-            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME} PATH_SUFFIXES bin)
-          endif()
-
-          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
-            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" PATH)
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-          else()
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-          endif()
-        endif()
-
-        if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
-          list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
-        else()
-          list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
+      if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}_DEBUG)
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}_DEBUG "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}_DEBUG)
+          list (REMOVE_ITEM 3RDPARTY_NO_LIBS 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}_DEBUG)
         endif()
       endif()
 
       if (WIN32)
-        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "")
-      else()
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "")
+        if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}_DEBUG)
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}_DEBUG "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+        endif()
+
+        if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}_DEBUG)
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}_DEBUG "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+          if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}_DEBUG)
+            list (REMOVE_ITEM 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}_DEBUG)
+          endif()
+        endif()
       endif()
+    endforeach()
+  endif()
 
-      foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-        string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-        if (WIN32)
-          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${3RDPARTY_${PRODUCT_NAME}_DLL_DIRS}")
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
-        else()
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS}")
-        endif()
-      endforeach()
+  set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "")
 
-      set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "")
+  if (INSTALL_${PRODUCT_NAME})
+    set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
 
-      if (INSTALL_${PRODUCT_NAME})
-        OCCT_MAKE_OS_WITH_BITNESS()
-        OCCT_MAKE_COMPILER_SHORT_NAME()
-        set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
-
-        if (WIN32)
-          if (SINGLE_GENERATOR)
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" DESTINATION "${INSTALL_DIR_BIN}")
-          else()
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-                     CONFIGURATIONS Release
-                     DESTINATION "${INSTALL_DIR_BIN}")
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-                     CONFIGURATIONS RelWithDebInfo
-                     DESTINATION "${INSTALL_DIR_BIN}i")
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-                     CONFIGURATIONS Debug
-                     DESTINATION "${INSTALL_DIR_BIN}d")
-          endif()
-        else()
-          get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} REALPATH)
-
-          if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
-            get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
-
-            if (SINGLE_GENERATOR)
-              install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
-            else()
-              install (FILES "${ABS_PATH}"
-                       CONFIGURATIONS Release
-                       DESTINATION "${INSTALL_DIR_LIB}"
-                       RENAME ${FREEIMLIB}.3)
-              install (FILES "${ABS_PATH}"
-                       CONFIGURATIONS RelWithDebInfo
-                       DESTINATION "${INSTALL_DIR_LIB}i"
-                       RENAME ${FREEIMLIB}.3)
-              install (FILES "${ABS_PATH}"
-                       CONFIGURATIONS Debug
-                       DESTINATION "${INSTALL_DIR_LIB}d"
-                       RENAME ${FREEIMLIB}.3)
-            endif()
-          endif()
-
-        endif()
+    if (WIN32)
+      if (SINGLE_GENERATOR)
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" DESTINATION "${INSTALL_DIR_BIN}")
       else()
-        # the library directory for using by the executable
-        foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-          string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-          if (WIN32)
-            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
-          else()
-            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
-          endif()
-        endforeach()
-        if (WIN32)
-          set (USED_3RDPARTY_${PRODUCT_NAME}_DIR ${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}})
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
+                  CONFIGURATIONS Release
+                  DESTINATION "${INSTALL_DIR_BIN}")
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
+                  CONFIGURATIONS RelWithDebInfo
+                  DESTINATION "${INSTALL_DIR_BIN}i")
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}_DEBUG}"
+                  CONFIGURATIONS Debug
+                  DESTINATION "${INSTALL_DIR_BIN}d")
+      endif()
+    else()
+      get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} REALPATH)
+
+      if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
+        get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
+
+        if (SINGLE_GENERATOR)
+          install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
+        else()
+          install (FILES "${ABS_PATH}"
+                    CONFIGURATIONS Release
+                    DESTINATION "${INSTALL_DIR_LIB}"
+                    RENAME ${FREEIMLIB}.3)
+          install (FILES "${ABS_PATH}"
+                    CONFIGURATIONS RelWithDebInfo
+                    DESTINATION "${INSTALL_DIR_LIB}i"
+                    RENAME ${FREEIMLIB}.3)
+
+          get_filename_component(FREEIMLIB_DEBUG ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}_DEBUG} NAME)
+          install (FILES "${ABS_PATH}"
+                    CONFIGURATIONS Debug
+                    DESTINATION "${INSTALL_DIR_LIB}d"
+                    RENAME ${FREEIMLIB_DEBUG}.3)
         endif()
       endif()
 
-      mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})
-#    endif()
-  endforeach()
+    endif()
+  else()
+    # the library directory for using by the executable
+    foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+      string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+      if (WIN32)
+        set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
+      else()
+        set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
+      endif()
+    endforeach()
+    if (WIN32)
+      set (USED_3RDPARTY_${PRODUCT_NAME}_DIR ${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}})
+    endif()
+  endif()
 endmacro()
 
 macro (COMPLIANCE_PRODUCT_CONSISTENCY LIBNAME)

adm/cmake/doxygen.cmake

@@ -56,7 +56,7 @@ else()
   endif()
 endif()
 
-# hide all redundant variables
-mark_as_advanced (DOXYGEN_SKIP_DOT)
-mark_as_advanced (DOXYGEN_EXECUTABLE)
-mark_as_advanced (DOXYGEN_DOT_EXECUTABLE)
+# unset all redundant variables
+OCCT_CHECK_AND_UNSET (DOXYGEN_SKIP_DOT)
+OCCT_CHECK_AND_UNSET (DOXYGEN_EXECUTABLE)
+OCCT_CHECK_AND_UNSET (DOXYGEN_DOT_EXECUTABLE)

adm/cmake/draco.cmake

@@ -1,109 +1,4 @@
 # 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(CSF_Draco draco::draco)
-  return()
-endif()
-
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
-if (NOT DEFINED 3RDPARTY_DRACO_DIR)
-  set (3RDPARTY_DRACO_DIR "" CACHE PATH "The directory containing Draco")
-endif()
-
-if (NOT DEFINED 3RDPARTY_DRACO_INCLUDE_DIR)
-  set (3RDPARTY_DRACO_INCLUDE_DIR  "" CACHE PATH "The directory containing headers of the Draco")
-endif()
-
-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY)
-  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library")
-endif()
-
-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR)
-  set (3RDPARTY_DRACO_LIBRARY_DIR "" CACHE PATH "The directory containing Draco library")
-endif()
-
-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DEBUG)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "" CACHE FILEPATH "Draco debug library")
-  endif()
-  
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR_DEBUG)
-    set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "" CACHE PATH "The directory containing Draco debug library")
-  endif()
-endif()
-
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_DRACO_DIR OR NOT EXISTS "${3RDPARTY_DRACO_DIR}")
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" draco DRACO_DIR_NAME)
-    if (DRACO_DIR_NAME)
-      set (3RDPARTY_DRACO_DIR "${3RDPARTY_DIR}/${DRACO_DIR_NAME}" CACHE PATH "The directory containing Draco" FORCE)
-    endif()
-  endif()
-endif()
-
-# header
-if (NOT 3RDPARTY_DRACO_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-  set (HEADER_NAMES draco)
-
-  # set 3RDPARTY_DRACO_INCLUDE_DIR as notfound, otherwise find_path can't assign a new value to 3RDPARTY_DRACO_INCLUDE_DIR
-  set (3RDPARTY_DRACO_INCLUDE_DIR "3RDPARTY_DRACO_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing headers of the Draco" FORCE)
-
-  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-    find_path (3RDPARTY_DRACO_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATHS ${3RDPARTY_DRACO_DIR}
-                                                 PATH_SUFFIXES "include"
-                                                 CMAKE_FIND_ROOT_PATH_BOTH
-                                                 NO_DEFAULT_PATH)
-  else()
-    find_path (3RDPARTY_DRACO_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATHS ${3RDPARTY_DRACO_DIR}
-                                                 PATH_SUFFIXES "include"
-                                                 CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-endif()
-
-if (3RDPARTY_DRACO_INCLUDE_DIR AND EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DRACO_INCLUDE_DIR)
-endif()
-
-SEARCH_DRACO_LIB()
+THIRDPARTY_PRODUCT("DRACO" "draco/draco_features.h" "CSF_Draco" "")

adm/cmake/eigen.cmake

@@ -83,5 +83,5 @@ else()
   set (3RDPARTY_EIGEN_INCLUDE_DIR "" CACHE PATH "the path to Eigen header file" FORCE)
 endif()
 
-# hide all redundant variables
-mark_as_advanced(Eigen3_DIR)
+# unset all redundant variables
+OCCT_CHECK_AND_UNSET(Eigen3_DIR)

adm/cmake/ffmpeg.cmake

@@ -1,15 +1,4 @@
-# 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()
+# FFmpeg
 
 if (NOT DEFINED INSTALL_FFMPEG)
   set (INSTALL_FFMPEG OFF CACHE BOOL "${INSTALL_FFMPEG_DESCR}")
@@ -247,7 +236,7 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})
   mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME})
 endforeach()
 
-# hide all redundant variables
-mark_as_advanced (FFMPEG_INCLUDE_DIRS)
-mark_as_advanced (FFMPEG_LIBRARY_DIRS)
-mark_as_advanced (FFMPEG_DIR)
+# unset all redundant variables
+OCCT_CHECK_AND_UNSET (FFMPEG_INCLUDE_DIRS)
+OCCT_CHECK_AND_UNSET (FFMPEG_LIBRARY_DIRS)
+OCCT_CHECK_AND_UNSET (FFMPEG_DIR)

adm/cmake/flex.cmake

@@ -33,11 +33,11 @@ if (NOT FLEX_FOUND OR NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}/Fl
 endif()
 
 # remove old general version of FlexLexer
-if (EXISTS ${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h)
-  message (STATUS "Info: remove old FLEX header file: ${OCCT_ROOT_DIR}/src/FlexLexer/FlexLexer.h")
-  file(REMOVE ${OCCT_ROOT_DIR}/src/FlexLexer/FlexLexer.h)
+if (EXISTS ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h)
+  message (STATUS "Info: remove old FLEX header file: ${CMAKE_SOURCE_DIR}/src/FlexLexer/FlexLexer.h")
+  file(REMOVE ${CMAKE_SOURCE_DIR}/src/FlexLexer/FlexLexer.h)
 endif()
 # install copy of FlexLexer.h locally to allow further building without flex
 if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
-  configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${OCCT_ROOT_DIR}/src/FlexLexer/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
+  configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${CMAKE_SOURCE_DIR}/src/FlexLexer/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
 endif()

adm/cmake/freeimage.cmake

@@ -1,16 +1,3 @@
 #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,18 +1,5 @@
 # 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()
@@ -177,14 +164,6 @@ 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)
@@ -389,10 +368,10 @@ endif()
   endif()
 #endif()
 
-# hide all redundant variables
-mark_as_advanced(FREETYPE_INCLUDE_DIR_ft2build)
-mark_as_advanced(FREETYPE_INCLUDE_DIR_freetype2)
-mark_as_advanced(FREETYPE_LIBRARY_RELEASE)
+# unset all redundant variables
+OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
+OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_freetype2)
+OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY_RELEASE)
 
 if (BUILD_SHARED_LIBS)
   mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)

adm/cmake/gtest.cmake

@@ -1,66 +0,0 @@
-# Google Test integration for OCCT
-
-# Only proceed if tests are enabled
-if (NOT BUILD_GTEST)
-  set(GOOGLETEST_FOUND FALSE)
-  return()
-endif()
-
-# Check if the user has specified whether to install Google Test
-if (NOT DEFINED INSTALL_GTEST)
-  set(INSTALL_GTEST OFF CACHE BOOL "Install Google Test")
-endif()
-
-# Google Test configuration options
-option(GTEST_USE_EXTERNAL "Use externally provided Google Test installation" OFF)
-option(GTEST_USE_FETCHCONTENT "Use FetchContent to download and build Google Test" ON)
-
-# Try to find existing GTest installation
-find_package(GTest QUIET)
-
-if(GTest_FOUND)
-  message(STATUS "Found Googletest installation")
-  set(GOOGLETEST_FOUND TRUE)
-  set(GTEST_USE_EXTERNAL TRUE)
-  set(GTEST_USE_FETCHCONTENT FALSE)
-else()
-  message(STATUS "Googletest not found in system paths")
-  if(GTEST_USE_FETCHCONTENT)
-    include(FetchContent)
-
-    # Set option to disable GMock before declaring the content
-    set(BUILD_GMOCK OFF CACHE BOOL "Builds the googlemock subproject" FORCE)
-
-    # For Windows: Prevent overriding the parent project's compiler/linker settings
-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-    FetchContent_Declare(
-      googletest
-      URL https://github.com/google/googletest/archive/refs/tags/v1.16.0.zip
-      DOWNLOAD_EXTRACT_TIMESTAMP true
-    )
-
-    FetchContent_MakeAvailable(googletest)
-
-    # Set proper grouping for the targets in solution explorer
-    if(TARGET gtest)
-      set_target_properties(gtest PROPERTIES FOLDER "ThirdParty/GoogleTest")
-      target_compile_definitions(gtest PRIVATE GTEST_CREATE_SHARED_LIBRARY=1)
-    endif()
-    if(TARGET gtest_main)
-      set_target_properties(gtest_main PROPERTIES FOLDER "ThirdParty/GoogleTest")
-      target_compile_definitions(gtest_main PRIVATE GTEST_CREATE_SHARED_LIBRARY=1)
-    endif()
-
-    # Set variables for consistent use throughout the build system
-    set(GOOGLETEST_FOUND TRUE)
-  else()
-    message(STATUS "Google Test not available. Tests will be skipped.")
-    set(GOOGLETEST_FOUND FALSE)
-  endif()
-endif()
-
-# Enable CTest if Google Test is available
-if(GOOGLETEST_FOUND)
-  include(GoogleTest)
-endif()

adm/cmake/jemalloc.cmake

@@ -1,6 +1,6 @@
 # JeMalloc
 
-function (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
+macro (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,25 +23,20 @@ function (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}}" PARENT_SCOPE)
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}")
     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} PARENT_SCOPE)
-    set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "" PARENT_SCOPE)
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB})
+    set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "")
   endif()
-
-  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)
+  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)
   endif()
   # install instructions
   if (INSTALL_JEMALLOC AND NOT JEMALLOC_IS_STATIC_LIB)
@@ -62,18 +57,18 @@ function (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
                  CONFIGURATIONS RelWithDebInfo
                  DESTINATION "${JEMALLOC_INSTALL_DESTINATION}i")
     endif()
-    set (USED_3RDPARTY_JEMALLOC_DIR "" PARENT_SCOPE)
+    set (USED_3RDPARTY_JEMALLOC_DIR "")
   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}} PARENT_SCOPE)
+    set (USED_3RDPARTY_JEMALLOC_DIR ${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}})
   endif()
   unset(3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} CACHE)
   unset(3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} CACHE)
-endfunction()
+endmacro()
 
 macro (SEARCH_JEMALLOC)
   # find static jemalloc lib
-  SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".lib" ".a")
+  SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
   if (WIN32)
     JEMALLOC_LIB_SEARCH ("jemalloc" "STATIC")
   elseif(NOT WIN32)
@@ -90,16 +85,6 @@ 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,25 +82,6 @@ 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")
@@ -113,8 +94,37 @@ if (WIN32)
   set (CSF_OpenGlLibs    "opengl32.lib")
   set (CSF_OpenGlesLibs  "libEGL libGLESv2")
 else()
+
   if (APPLE)
-   # Will be called later
+    set (CSF_objc        "objc")
+
+    # frameworks
+    if (IOS)
+      find_library (Appkit_LIB NAMES UIKit)
+      set (CSF_Appkit ${Appkit_LIB})
+    else()
+      find_library (Appkit_LIB NAMES AppKit)
+      set (CSF_Appkit ${Appkit_LIB})
+    endif()
+    OCCT_CHECK_AND_UNSET (Appkit_LIB)
+
+    find_library (IOKit_LIB NAMES IOKit)
+    set (CSF_IOKit ${IOKit_LIB})
+    OCCT_CHECK_AND_UNSET (IOKit_LIB)
+
+    if (IOS)
+      find_library (OpenGlesLibs_LIB NAMES OpenGLES)
+      set (CSF_OpenGlesLibs ${OpenGlesLibs_LIB})
+      OCCT_CHECK_AND_UNSET (OpenGlesLibs_LIB)
+    elseif (USE_XLIB)
+      set (CSF_OpenGlLibs "GL")
+      set (CSF_XwLibs     "X11")
+    else()
+      find_library (OpenGlLibs_LIB NAMES OpenGL)
+      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
+      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
+    endif()
+
   elseif (EMSCRIPTEN)
     set (CSF_ThreadLibs   "pthread rt stdc++")
     set (CSF_OpenGlesLibs "EGL GLESv2")
@@ -134,59 +144,7 @@ else()
     set (CSF_OpenGlesLibs "EGL GLESv2")
     set (CSF_dl          "dl")
     if (USE_FREETYPE)
-      set (CSF_fontconfig "fontconfig expat")
+      set (CSF_fontconfig "fontconfig")
     endif()
   endif()
 endif()
-
-# Updates APPLE variables
-function(occt_set_apple_csf_vars)
-  set (CSF_objc        "objc" PARENT_SCOPE)
-
-  # frameworks
-  if (IOS)
-    find_library (Appkit_LIB NAMES UIKit)
-    if (Appkit_LIB)
-      set (CSF_Appkit ${Appkit_LIB} PARENT_SCOPE)
-    else()
-      set (CSF_Appkit "UIKit" PARENT_SCOPE)
-    endif()
-  else()
-    find_library (Appkit_LIB NAMES AppKit)
-    if (Appkit_LIB)
-      set (CSF_Appkit ${Appkit_LIB} PARENT_SCOPE)
-    else()
-      set (CSF_Appkit "AppKit" PARENT_SCOPE)
-    endif()
-  endif()
-  OCCT_CHECK_AND_UNSET (Appkit_LIB)
-
-  find_library (IOKit_LIB NAMES IOKit)
-  if (IOKit_LIB)
-    set (CSF_IOKit ${IOKit_LIB} PARENT_SCOPE)
-  else()
-    set (CSF_IOKit "IOKit" PARENT_SCOPE)
-  endif()
-  OCCT_CHECK_AND_UNSET (IOKit_LIB)
-
-  if (IOS)
-    find_library (OpenGlesLibs_LIB NAMES OpenGLES)
-    if (OpenGlesLibs_LIB)
-      set (CSF_OpenGlesLibs ${OpenGlesLibs_LIB} PARENT_SCOPE)
-    else()
-      set (CSF_OpenGlesLibs "OpenGLES" PARENT_SCOPE)
-    endif()
-    OCCT_CHECK_AND_UNSET (OpenGlesLibs_LIB)
-  elseif (USE_XLIB)
-    set (CSF_OpenGlLibs "GL" PARENT_SCOPE)
-    set (CSF_XwLibs     "X11" PARENT_SCOPE)
-  else()
-    find_library (OpenGlLibs_LIB NAMES OpenGL)
-    if (OpenGlLibs_LIB)
-      set (CSF_OpenGlLibs ${OpenGlLibs_LIB} PARENT_SCOPE)
-    else()
-      set (CSF_OpenGlLibs "OpenGL" PARENT_SCOPE)
-    endif()
-    OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
-  endif()
-endfunction()

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 /wd26812")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd\"26812\"")
   # 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,10 +38,6 @@ 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()
 
@@ -151,31 +147,14 @@ 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} -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()
+    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")
 
-    # Link-Time Code Generation (LTCG) is required for Whole Program Optimization
+    # Link-Time Code Generation(LTCG) is requared for Whole Program Optimisation(GL)
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto")
-    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()
+    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")
   endif()
   if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
@@ -194,21 +173,19 @@ 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()
-  if (NOT WIN32)
-    # Optimize size of binaries
-    set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
-  endif()
-endif()
-if(MINGW)
+  # Optimize size of binaries
+  set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
+elseif(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")
-  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")
+elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
   # 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_doc.cmake

@@ -1,687 +0,0 @@
-##
-
-# Function to collect modules, toolkits, and packages information for documentation
-function(OCCT_DOC_COLLECT_MODULES_INFO)
-  # Set output variables in parent scope
-  set(OCCT_MODULES ${OCCT_MODULES} PARENT_SCOPE)
-
-  # For each module, collect its toolkits
-  foreach(OCCT_MODULE ${OCCT_MODULES})
-    if(NOT "${OCCT_MODULE}" STREQUAL "")
-      set(MODULES_TOOLKITS ${${OCCT_MODULE}_TOOLKITS})
-      set(TOOLKITS_IN_MODULE_${OCCT_MODULE} ${MODULES_TOOLKITS} PARENT_SCOPE)
-
-      # For each toolkit, collect its packages
-      foreach(TOOLKIT ${MODULES_TOOLKITS})
-        set(TOOLKIT_PARENT_MODULE_${TOOLKIT} ${OCCT_MODULE} PARENT_SCOPE)
-
-        # Get packages from toolkit
-        set(TOOLKIT_PACKAGES "")
-        EXTRACT_TOOLKIT_PACKAGES("src" ${TOOLKIT} TOOLKIT_PACKAGES)
-        set(PACKAGES_IN_TOOLKIT_${TOOLKIT} ${TOOLKIT_PACKAGES} PARENT_SCOPE)
-      endforeach()
-    endif()
-  endforeach()
-endfunction()
-
-# Function to generate module dependency graph
-function(OCCT_DOC_CREATE_MODULE_DEPENDENCY_GRAPH OUTPUT_DIR FILENAME)
-  set(DOT_FILE "${OUTPUT_DIR}/${FILENAME}.dot")
-
-  # Create .dot file for module dependencies
-  file(WRITE ${DOT_FILE} "digraph ${FILENAME}\n{\n")
-
-  # Create a list to track unique module connections
-  set(MODULE_CONNECTIONS)
-
-  foreach(MODULE ${OCCT_MODULES})
-    if(NOT "${MODULE}" STREQUAL "")
-      # Convert module name to lowercase for URL
-      string(TOLOWER ${MODULE} MODULE_LOWER)
-      file(APPEND ${DOT_FILE} "\t${MODULE} [ URL = \"module_${MODULE_LOWER}.html\" ]\n")
-
-      # Add dependencies between modules
-      foreach(MODULE_TOOLKIT ${TOOLKITS_IN_MODULE_${MODULE}})
-        foreach(DEPENDENT_TOOLKIT ${TOOLKIT_DEPENDENCY_${MODULE_TOOLKIT}})
-          if(DEFINED TOOLKIT_PARENT_MODULE_${DEPENDENT_TOOLKIT} AND 
-             NOT "${TOOLKIT_PARENT_MODULE_${DEPENDENT_TOOLKIT}}" STREQUAL "${MODULE}")
-            # Create a unique connection identifier
-            set(CONNECTION "${TOOLKIT_PARENT_MODULE_${DEPENDENT_TOOLKIT}}->${MODULE}")
-            list(FIND MODULE_CONNECTIONS "${CONNECTION}" CONNECTION_EXISTS)
-            
-            # Add connection only if it doesn't exist yet
-            if(${CONNECTION_EXISTS} EQUAL -1)
-              list(APPEND MODULE_CONNECTIONS "${CONNECTION}")
-              file(APPEND ${DOT_FILE} "\t${TOOLKIT_PARENT_MODULE_${DEPENDENT_TOOLKIT}} -> ${MODULE} [ dir = \"back\", color = \"midnightblue\", style = \"solid\" ]\n")
-            endif()
-          endif()
-        endforeach()
-      endforeach()
-    endif()
-  endforeach()
-
-  file(APPEND ${DOT_FILE} "}\n")
-
-  # Return the output file name
-  set(DOT_OUTPUT_FILE "${FILENAME}" PARENT_SCOPE)
-endfunction()
-
-# Function to generate toolkit dependency graph for a module
-function(OCCT_DOC_CREATE_TOOLKIT_DEPENDENCY_GRAPH OUTPUT_DIR FILENAME MODULE_NAME)
-  set(DOT_FILE "${OUTPUT_DIR}/${FILENAME}.dot")
-
-  # Create .dot file for toolkit dependencies within a module
-  file(WRITE ${DOT_FILE} "digraph ${FILENAME}\n{\n")
-
-  foreach(TOOLKIT ${TOOLKITS_IN_MODULE_${MODULE_NAME}})
-    # Convert toolkit name to lowercase for URL
-    string(TOLOWER ${TOOLKIT} TOOLKIT_LOWER)
-    file(APPEND ${DOT_FILE} "\t${TOOLKIT} [ URL = \"toolkit_${TOOLKIT_LOWER}.html\" ]\n")
-
-    # Add dependencies between toolkits in the same module
-    foreach(DEPENDENT_TOOLKIT ${TOOLKIT_DEPENDENCY_${TOOLKIT}})
-      if(DEFINED TOOLKIT_PARENT_MODULE_${DEPENDENT_TOOLKIT} AND 
-         "${TOOLKIT_PARENT_MODULE_${DEPENDENT_TOOLKIT}}" STREQUAL "${MODULE_NAME}")
-        file(APPEND ${DOT_FILE} "\t${DEPENDENT_TOOLKIT} -> ${TOOLKIT} [ dir = \"back\", color = \"midnightblue\", style = \"solid\" ]\n")
-      endif()
-    endforeach()
-  endforeach()
-
-  file(APPEND ${DOT_FILE} "}\n")
-
-  # Return the output file name
-  set(DOT_OUTPUT_FILE "${FILENAME}" PARENT_SCOPE)
-endfunction()
-
-# Function to generate dependency graph for a specific toolkit
-function(OCCT_DOC_CREATE_SINGLE_TOOLKIT_DEPENDENCY_GRAPH OUTPUT_DIR FILENAME TOOLKIT_NAME)
-  set(DOT_FILE "${OUTPUT_DIR}/${FILENAME}.dot")
-
-  # Create .dot file for dependencies of a single toolkit
-  file(WRITE ${DOT_FILE} "digraph ${FILENAME}\n{\n")
-
-  # Convert toolkit name to lowercase for URL
-  string(TOLOWER ${TOOLKIT_NAME} TOOLKIT_NAME_LOWER)
-  file(APPEND ${DOT_FILE} "\t${TOOLKIT_NAME} [ URL = \"toolkit_${TOOLKIT_NAME_LOWER}.html\", shape = box ]\n")
-
-  # Add toolkit dependencies
-  foreach(DEPENDENT_TOOLKIT ${TOOLKIT_DEPENDENCY_${TOOLKIT_NAME}})
-    # Convert dependent toolkit name to lowercase for URL
-    string(TOLOWER ${DEPENDENT_TOOLKIT} DEPENDENT_TOOLKIT_LOWER)
-    file(APPEND ${DOT_FILE} "\t${DEPENDENT_TOOLKIT} [ URL = \"toolkit_${DEPENDENT_TOOLKIT_LOWER}.html\", shape = box ]\n")
-    file(APPEND ${DOT_FILE} "\t${TOOLKIT_NAME} -> ${DEPENDENT_TOOLKIT} [ color = \"midnightblue\", style = \"solid\" ]\n")    
-  endforeach()
-
-  if(TOOLKIT_DEPENDENCY_${TOOLKIT_NAME})
-    list(LENGTH TOOLKIT_DEPENDENCY_${TOOLKIT_NAME} DEPS_COUNT)
-    if(DEPS_COUNT GREATER 1)
-      file(APPEND ${DOT_FILE} "\taspect = 1\n")
-    endif()
-  endif()
-
-  file(APPEND ${DOT_FILE} "}\n")
-
-  # Return the output file name
-  set(DOT_OUTPUT_FILE "${FILENAME}" PARENT_SCOPE)
-endfunction()
-
-# Function to generate main page for documentation
-function(OCCT_DOC_GENERATE_MAIN_PAGE OUTPUT_DIR OUTPUT_FILE)
-  set(MAIN_PAGE_FILE "${OUTPUT_DIR}/${OUTPUT_FILE}")
-  file(WRITE ${MAIN_PAGE_FILE} "/**\n")
-
-  # Check if we're generating documentation for a single module
-  if(DOC_SINGLE_MODULE)
-    file(APPEND ${MAIN_PAGE_FILE} "\\mainpage OCCT Module ${DOC_SINGLE_MODULE}\n")
-  else()
-    file(APPEND ${MAIN_PAGE_FILE} "\\mainpage Open CASCADE Technology Reference Manual\n\n")
-    # List all modules
-    foreach(MODULE ${OCCT_MODULES})
-      if(NOT "${MODULE}" STREQUAL "")
-        # page id must be in lowercase
-        string(TOLOWER ${MODULE} MODULE_LOWER)
-        file(APPEND ${MAIN_PAGE_FILE} "\\li \\subpage module_${MODULE_LOWER}\n")
-      endif()
-    endforeach()
-    # Add modules relationship diagram
-    OCCT_DOC_CREATE_MODULE_DEPENDENCY_GRAPH("${OUTPUT_DIR}/html" "schema_all_modules")
-    file(APPEND ${MAIN_PAGE_FILE} "\\dotfile schema_all_modules.dot\n")
-  endif()
-
-  file(APPEND ${MAIN_PAGE_FILE} "**/\n\n")
-
-  # Generate pages for modules and their toolkits
-  foreach(MODULE ${OCCT_MODULES})
-    if(NOT "${MODULE}" STREQUAL "")
-      file(APPEND ${MAIN_PAGE_FILE} "/**\n")
-
-      if(DOC_SINGLE_MODULE)
-        file(APPEND ${MAIN_PAGE_FILE} "\\mainpage OCCT Module ${MODULE}\n")
-      else()
-         # page id must be in lowercase
-        string(TOLOWER ${MODULE} MODULE_LOWER)
-        file(APPEND ${MAIN_PAGE_FILE} "\\page module_${MODULE_LOWER} Module ${MODULE}\n")
-      endif()
-
-      # List toolkits in the module
-      foreach(TOOLKIT ${TOOLKITS_IN_MODULE_${MODULE}})
-        # page id must be in lowercase
-        string(TOLOWER ${TOOLKIT} TOOLKIT_LOWER)
-        file(APPEND ${MAIN_PAGE_FILE} "\\li \\subpage toolkit_${TOOLKIT_LOWER}\n")
-      endforeach()
-
-      # Add module diagram
-      OCCT_DOC_CREATE_TOOLKIT_DEPENDENCY_GRAPH("${OUTPUT_DIR}/html" "schema_${MODULE}" ${MODULE})
-      file(APPEND ${MAIN_PAGE_FILE} "\\dotfile schema_${MODULE}.dot\n")
-      file(APPEND ${MAIN_PAGE_FILE} "**/\n\n")
-    endif()
-  endforeach()
-
-  # Generate pages for toolkits and their packages
-  foreach(MODULE ${OCCT_MODULES})
-    if(NOT "${MODULE}" STREQUAL "")
-      foreach(TOOLKIT ${TOOLKITS_IN_MODULE_${MODULE}})
-        file(APPEND ${MAIN_PAGE_FILE} "/**\n")
-        # page id must be in lowercase
-        string(TOLOWER ${TOOLKIT} TOOLKIT_LOWER)
-        file(APPEND ${MAIN_PAGE_FILE} "\\page toolkit_${TOOLKIT_LOWER} Toolkit ${TOOLKIT}\n")
-
-        # List packages in toolkit
-        foreach(PACKAGE ${PACKAGES_IN_TOOLKIT_${TOOLKIT}})
-          set(PACKAGE_NAME ${PACKAGE})
-          # page id must be in lowercase
-          string(TOLOWER ${PACKAGE_NAME} PACKAGE_NAME_LOWER)
-          file(APPEND ${MAIN_PAGE_FILE} "\\li \\subpage package_${PACKAGE_NAME_LOWER}\n")
-        endforeach()
-
-        # Add toolkit dependencies diagram
-        OCCT_DOC_CREATE_SINGLE_TOOLKIT_DEPENDENCY_GRAPH("${OUTPUT_DIR}/html" "schema_${TOOLKIT}" ${TOOLKIT})
-        file(APPEND ${MAIN_PAGE_FILE} "\\dotfile schema_${TOOLKIT}.dot\n")
-        file(APPEND ${MAIN_PAGE_FILE} "**/\n\n")
-      endforeach()
-    endif()
-  endforeach()
-
-  # Generate pages for packages and their classes
-  foreach(MODULE ${OCCT_MODULES})
-    if(NOT "${MODULE}" STREQUAL "")
-      foreach(TOOLKIT ${TOOLKITS_IN_MODULE_${MODULE}})
-        foreach(PACKAGE ${PACKAGES_IN_TOOLKIT_${TOOLKIT}})
-          file(APPEND ${MAIN_PAGE_FILE} "/**\n")
-          # page id must be in lowercase
-          string(TOLOWER ${PACKAGE} PACKAGE_LOWER)
-          file(APPEND ${MAIN_PAGE_FILE} "\\page package_${PACKAGE_LOWER} Package ${PACKAGE}\n")
-
-          # Find header files in the package
-          EXTRACT_PACKAGE_FILES ("src" ${PACKAGE} ALL_FILES _)
-          set (HEADER_FILES_FILTERING ${ALL_FILES})
-          list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|hxx|hpp)$")
-
-          foreach(HEADER ${HEADER_FILES_FILTERING})
-            get_filename_component(HEADER_NAME ${HEADER} NAME_WE)
-            file(APPEND ${MAIN_PAGE_FILE} "\\li \\subpage ${HEADER_NAME}\n")
-            # Append header file to DOXYGEN_INPUT_FILES list
-            list(APPEND DOXYGEN_INPUT_FILES "${HEADER}")
-          endforeach()
-
-          file(APPEND ${MAIN_PAGE_FILE} "**/\n\n")
-        endforeach()
-      endforeach()
-    endif()
-  endforeach()
-
-  # Create a variable containing all input files for Doxygen
-  string(REPLACE ";" " " DOXYGEN_INPUT_FILES_STRING "${DOXYGEN_INPUT_FILES}")
-  set(DOXYGEN_INPUT_FILES_STRING ${DOXYGEN_INPUT_FILES_STRING} PARENT_SCOPE)
-endfunction()
-
-# Function to extract dependency information for toolkits
-function(OCCT_DOC_EXTRACT_TOOLKIT_DEPENDENCIES)
-  foreach(MODULE ${OCCT_MODULES})
-    if(NOT "${MODULE}" STREQUAL "")
-      foreach(TOOLKIT ${TOOLKITS_IN_MODULE_${MODULE}})
-        EXTRACT_TOOLKIT_EXTERNLIB("src" ${TOOLKIT} EXTERNLIB_LIST)
-
-        set(DEPENDENT_TOOLKITS "")
-        foreach(EXTERNLIB ${EXTERNLIB_LIST})
-          if(EXTERNLIB MATCHES "^TK")
-            list(APPEND DEPENDENT_TOOLKITS ${EXTERNLIB})
-          endif()
-        endforeach()
-
-        set(TOOLKIT_DEPENDENCY_${TOOLKIT} ${DEPENDENT_TOOLKITS} PARENT_SCOPE)
-      endforeach()
-    endif()
-  endforeach()
-endfunction()
-
-# Function to load file lists for documentation
-function(OCCT_DOC_LOAD_FILE_LISTS)
-  # Load list of HTML documentation files
-  set(FILES_HTML_PATH "${OCCT_ROOT_DIR}/dox/FILES_HTML.txt")
-  if(EXISTS ${FILES_HTML_PATH})
-    file(STRINGS ${FILES_HTML_PATH} HTML_FILES REGEX "^[^#]+")
-    set(OCCT_DOC_HTML_FILES ${HTML_FILES} PARENT_SCOPE)
-  else()
-    set(OCCT_DOC_HTML_FILES "" PARENT_SCOPE)
-  endif()
-
-  # Load list of PDF documentation files
-  set(FILES_PDF_PATH "${OCCT_ROOT_DIR}/dox/FILES_PDF.txt")
-  if(EXISTS ${FILES_PDF_PATH})
-    file(STRINGS ${FILES_PDF_PATH} PDF_FILES REGEX "^[^#]+")
-    set(OCCT_DOC_PDF_FILES ${PDF_FILES} PARENT_SCOPE)
-  else()
-    set(OCCT_DOC_PDF_FILES "" PARENT_SCOPE)
-  endif()
-endfunction()
-
-# Function to collect image directories from input files
-function(OCCT_DOC_COLLECT_IMAGE_DIRS INPUT_DIRS RESULT_IMAGE_DIRS)
-  set(IMAGE_DIRS "")
-
-  foreach(INPUT_DIR ${INPUT_DIRS})
-    # Check if directory exists
-    if(EXISTS "${INPUT_DIR}")
-      # Add the standard "images" subdirectory if it exists
-      if(EXISTS "${INPUT_DIR}/images")
-        list(APPEND IMAGE_DIRS "${INPUT_DIR}/images")
-      endif()
-
-      # Find all subdirectories containing images
-      file(GLOB_RECURSE IMAGE_FILES 
-           "${INPUT_DIR}/*.png" 
-           "${INPUT_DIR}/*.jpg" 
-           "${INPUT_DIR}/*.jpeg" 
-           "${INPUT_DIR}/*.gif" 
-           "${INPUT_DIR}/*.svg")
-
-      foreach(IMAGE_FILE ${IMAGE_FILES})
-        get_filename_component(IMAGE_DIR ${IMAGE_FILE} DIRECTORY)
-        list(APPEND IMAGE_DIRS "${IMAGE_DIR}")
-      endforeach()
-    endif()
-  endforeach()
-
-  if(IMAGE_DIRS)
-    list(REMOVE_DUPLICATES IMAGE_DIRS)
-  endif()
-
-  set(${RESULT_IMAGE_DIRS} ${IMAGE_DIRS} PARENT_SCOPE)
-endfunction()
-
-# Function to configure and run Doxygen for documentation generation
-function(OCCT_DOC_CONFIGURE_DOXYGEN OUTPUT_DIR CONFIG_FILE DOC_TYPE)
-  # Create output directory if it doesn't exist
-  file(MAKE_DIRECTORY ${OUTPUT_DIR})
-
-  # Use existing Doxygen template file as base
-  if(DOC_TYPE STREQUAL "OVERVIEW")
-    set(TEMPLATE_DOXYFILE "${OCCT_ROOT_DIR}/dox/resources/occt_ug_html.doxyfile")
-  else()
-    set(TEMPLATE_DOXYFILE "${OCCT_ROOT_DIR}/dox/resources/occt_rm.doxyfile")
-  endif()
-
-  # Define Doxygen parameters that need to be overridden from the template
-  set(DOXYGEN_CONFIG_FILE "${OUTPUT_DIR}/${CONFIG_FILE}")
-
-  # Check if template file exists
-  if(NOT EXISTS ${TEMPLATE_DOXYFILE})
-    message(FATAL_ERROR "ERROR: Doxygen template file not found: ${TEMPLATE_DOXYFILE}")
-    return()
-  endif()
-
-  # Read template content
-  file(READ ${TEMPLATE_DOXYFILE} DOXYGEN_TEMPLATE_CONTENT)
-
-  # Create the output Doxyfile
-  file(WRITE ${DOXYGEN_CONFIG_FILE} "# Doxyfile generated by OCCT_DOC_CONFIGURE_DOXYGEN\n")
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "# Base template: ${TEMPLATE_DOXYFILE}\n\n")
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "${DOXYGEN_TEMPLATE_CONTENT}\n\n")
-
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "# Custom overrides set by CMake:\n")
-
-  # Project information
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "PROJECT_NUMBER = ${OCC_VERSION_STRING_EXT}\n")
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "OUTPUT_DIRECTORY = ${OUTPUT_DIR}\n")
-
-  # Ensure client-side search is configured correctly
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "\n# Search engine settings\n")
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "SEARCHENGINE = YES\n")
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "SERVER_BASED_SEARCH = NO\n")
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "EXTERNAL_SEARCH = NO\n")
-  file(APPEND ${DOXYGEN_CONFIG_FILE} "SEARCHDATA_FILE = searchdata.xml\n")
-
-  # Additional parameters based on the document type
-  if(DOC_TYPE STREQUAL "OVERVIEW")
-    # Settings for Overview documentation
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "PROJECT_LOGO = ${OCCT_ROOT_DIR}/dox/resources/occ_logo.png\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "EXTRACT_ALL = NO\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "EXTRACT_PRIVATE = NO\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "EXTRACT_STATIC = NO\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "EXCLUDE_PATTERNS = */src/* */inc/* */drv/* */Properties/*\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "ENABLED_SECTIONS = OVERVIEW_SECTION\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "GENERATE_TAGFILE = ${OUTPUT_DIR}/occt.tag\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "GENERATE_TREEVIEW = YES\n")
-    
-    # Setup tag file for cross-referencing with Reference Manual
-    if(BUILD_DOC_RefMan)
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "\n# Cross-referencing with Reference Manual\n")
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "TAGFILES = \"${CMAKE_BINARY_DIR}/doc/refman/occt_refman.tag=../../refman/html\"\n")
-    endif()
-
-    # Input files for overview
-    if(DEFINED OCCT_OVERVIEW_FILES)
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "INPUT = ${OCCT_OVERVIEW_FILES}\n")
-    else()
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "INPUT = ${OCCT_ROOT_DIR}/dox\n")
-    endif()
-
-    # Collect image directories for overview
-    set(OVERVIEW_INPUT_DIRS ${OCCT_ROOT_DIR}/dox)
-    OCCT_DOC_COLLECT_IMAGE_DIRS("${OVERVIEW_INPUT_DIRS}" OVERVIEW_IMAGE_DIRS)
-
-    # Image path for overview
-    if(OVERVIEW_IMAGE_DIRS)
-      string(REPLACE ";" " " OVERVIEW_IMAGE_DIRS_STR "${OVERVIEW_IMAGE_DIRS}")
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "IMAGE_PATH = ${OVERVIEW_IMAGE_DIRS_STR} ${OCCT_ROOT_DIR}/dox/resources\n")
-    else()
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "IMAGE_PATH = ${OCCT_ROOT_DIR}/dox/resources\n")
-    endif()
-
-    # Example paths
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "EXAMPLE_PATH = ${OCCT_ROOT_DIR}/src ${OCCT_ROOT_DIR}/samples\n")
-  else()
-    # Settings for Reference Manual
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "PROJECT_NAME = \"Open CASCADE Technology Reference Manual\"\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "PROJECT_LOGO = ${OCCT_ROOT_DIR}/dox/resources/occ_logo.png\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "BUILTIN_STL_SUPPORT = YES\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "EXTRACT_PRIVATE = NO\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "EXTRACT_PACKAGE = YES\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "EXCLUDE_PATTERNS = */Properties/*\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "FILE_PATTERNS = *.h *.hxx *.lxx *.gxx *.pxx *.cxx *.cpp *.c *.md\n")
-
-    # Generate a tag file for cross-referencing from Overview
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "\n# Generate tag file for cross-referencing\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "GENERATE_TAGFILE = ${OUTPUT_DIR}/occt_refman.tag\n")
-
-    # Input files for reference manual - CRITICAL FOR PROPER GENERATION
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "\n# Input files for reference manual\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "INPUT = ${OCCT_ROOT_DIR}/src\n")
-
-    # If generating documentation for specific modules
-    if(DEFINED OCCT_DOC_MODULES)
-      set(MODULE_PATHS "")
-      foreach(MODULE ${OCCT_DOC_MODULES})
-        foreach(TOOLKIT ${${MODULE}_TOOLKITS})
-          list(APPEND MODULE_PATHS "${OCCT_ROOT_DIR}/src/${TOOLKIT}")
-        endforeach()
-      endforeach()
-      string(REPLACE ";" " " MODULE_PATHS_STR "${MODULE_PATHS}")
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "INPUT += ${MODULE_PATHS_STR}\n") # Use += to append to existing INPUT
-    endif()
-
-    # Configure image path for reference manual
-    set(REFMAN_INPUT_DIRS ${OCCT_ROOT_DIR}/src)
-    OCCT_DOC_COLLECT_IMAGE_DIRS("${REFMAN_INPUT_DIRS}" REFMAN_IMAGE_DIRS)
-
-    if(REFMAN_IMAGE_DIRS)
-      string(REPLACE ";" " " REFMAN_IMAGE_DIRS_STR "${REFMAN_IMAGE_DIRS}")
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "IMAGE_PATH = ${REFMAN_IMAGE_DIRS_STR} ${OCCT_ROOT_DIR}/dox/resources\n")
-    else()
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "IMAGE_PATH = ${OCCT_ROOT_DIR}/dox/resources\n")
-    endif()
-
-    # Add main page file if generated
-    if(EXISTS "${OUTPUT_DIR}/main_page.dox")
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "INPUT += ${OUTPUT_DIR}/main_page.dox\n") # Use += to append to existing INPUT
-    endif()
-
-    # Add header files to Doxygen input
-    if(DEFINED DOXYGEN_INPUT_FILES_STRING)
-      file(APPEND ${DOXYGEN_CONFIG_FILE} "INPUT += ${DOXYGEN_INPUT_FILES_STRING}\n") # Use += to append to existing INPUT
-    endif()
-  endif()
-
-  # Custom CSS
-  if(EXISTS "${OCCT_ROOT_DIR}/dox/resources/custom.css")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "HTML_EXTRA_STYLESHEET = ${OCCT_ROOT_DIR}/dox/resources/custom.css\n")
-  endif()
-
-  # Set paths for dot tool
-  if(GRAPHVIZ_DOT_EXECUTABLE)
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "DOT_PATH = ${GRAPHVIZ_DOT_EXECUTABLE}\n")
-    get_filename_component(DOT_DIRECTORY ${GRAPHVIZ_DOT_EXECUTABLE} DIRECTORY)
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "DOTFONTPATH = ${DOT_DIRECTORY}\n")
-    file(APPEND ${DOXYGEN_CONFIG_FILE} "DOTFILE_DIRS = ${OUTPUT_DIR}/html\n")
-  endif()
-
-  # Confirm file creation
-  if(EXISTS ${DOXYGEN_CONFIG_FILE})
-    message(STATUS "Successfully created Doxygen configuration file at: ${DOXYGEN_CONFIG_FILE}")
-  else()
-    message(FATAL_ERROR "Failed to create Doxygen configuration file at: ${DOXYGEN_CONFIG_FILE}")
-  endif()
-endfunction()
-
-# Function to check if required tools are available
-function(OCCT_DOC_CHECK_TOOLS)
-  # Find Doxygen
-  find_package(Doxygen QUIET)
-  if(NOT DOXYGEN_FOUND)
-    message(WARNING "Doxygen not found. Documentation will not be generated.")
-    set(OCCT_DOC_TOOLS_AVAILABLE FALSE PARENT_SCOPE)
-    return()
-  endif()
-
-  # Find Graphviz
-  find_program(GRAPHVIZ_DOT_EXECUTABLE NAMES dot)
-
-  # Check for MathJax for LaTeX formulas
-  if(NOT MATHJAX_PATH)
-    set(MATHJAX_PATH "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5")
-  endif()
-
-  # Find tools for PDF generation if needed
-  if(BUILD_DOC_PDF)
-    # Find pdflatex
-    find_program(PDFLATEX_EXECUTABLE NAMES pdflatex)
-    if(NOT PDFLATEX_EXECUTABLE)
-      message(WARNING "pdflatex not found. PDF documentation will not be generated.")
-      set(BUILD_DOC_PDF FALSE PARENT_SCOPE)
-    endif()
-
-    # Find Inkscape (for SVG to PNG conversion for PDFs)
-    find_program(INKSCAPE_EXECUTABLE NAMES inkscape)
-    if(NOT INKSCAPE_EXECUTABLE)
-      message(WARNING "Inkscape not found. SVG images will not be properly converted in PDF documentation.")
-    endif()
-
-    set(PDFLATEX_EXECUTABLE ${PDFLATEX_EXECUTABLE} PARENT_SCOPE)
-    set(INKSCAPE_EXECUTABLE ${INKSCAPE_EXECUTABLE} PARENT_SCOPE)
-  endif()
-
-  # Find tools for CHM generation if needed
-  if(BUILD_DOC_CHM AND WIN32)
-    # Find HTML Help Compiler
-    find_program(HHC_EXECUTABLE NAMES hhc HHC)
-    if(NOT HHC_EXECUTABLE)
-      message(WARNING "HTML Help Compiler not found. CHM documentation will not be generated.")
-      set(BUILD_DOC_CHM FALSE PARENT_SCOPE)
-    endif()
-
-    set(HHC_EXECUTABLE ${HHC_EXECUTABLE} PARENT_SCOPE)
-  endif()
-
-  set(GRAPHVIZ_DOT_EXECUTABLE ${GRAPHVIZ_DOT_EXECUTABLE} PARENT_SCOPE)
-  set(MATHJAX_PATH ${MATHJAX_PATH} PARENT_SCOPE)
-  set(OCCT_DOC_TOOLS_AVAILABLE TRUE PARENT_SCOPE)
-endfunction()
-
-# Function to process LaTeX files for PDF generation
-function(OCCT_DOC_PROCESS_LATEX OUTPUT_DIR)
-  # Skip if PDF generation is not enabled or pdflatex not found
-  if(NOT BUILD_DOC_PDF OR NOT PDFLATEX_EXECUTABLE)
-    return()
-  endif()
-
-  message(STATUS "Processing LaTeX files for PDF generation...")
-
-  # Process SVG images if Inkscape is available
-  if(INKSCAPE_EXECUTABLE)
-    file(GLOB SVG_FILES "${OUTPUT_DIR}/latex/*.svg")
-    foreach(SVG_FILE ${SVG_FILES})
-      get_filename_component(FILE_NAME ${SVG_FILE} NAME_WE)
-      set(PNG_FILE "${OUTPUT_DIR}/latex/${FILE_NAME}.png")
-
-      execute_process(
-        COMMAND ${INKSCAPE_EXECUTABLE} -z -e ${PNG_FILE} ${SVG_FILE}
-        RESULT_VARIABLE INKSCAPE_RESULT
-      )
-
-      if(NOT INKSCAPE_RESULT EQUAL 0)
-        message(WARNING "Failed to convert ${SVG_FILE} to PNG")
-      endif()
-    endforeach()
-  endif()
-
-  # Generate PDF from LaTeX
-  execute_process(
-    COMMAND ${PDFLATEX_EXECUTABLE} -interaction=nonstopmode refman.tex
-    WORKING_DIRECTORY "${OUTPUT_DIR}/latex"
-    RESULT_VARIABLE LATEX_RESULT
-    OUTPUT_VARIABLE LATEX_OUTPUT
-    ERROR_VARIABLE LATEX_ERROR
-  )
-
-  if(NOT LATEX_RESULT EQUAL 0)
-    message(WARNING "Error generating PDF: ${LATEX_ERROR}")
-  else()
-    # Run pdflatex again for references
-    execute_process(
-      COMMAND ${PDFLATEX_EXECUTABLE} -interaction=nonstopmode refman.tex
-      WORKING_DIRECTORY "${OUTPUT_DIR}/latex"
-    )
-
-    message(STATUS "PDF documentation generated at ${OUTPUT_DIR}/latex/refman.pdf")
-
-    # Copy the PDF to a more accessible location
-    file(COPY "${OUTPUT_DIR}/latex/refman.pdf" DESTINATION "${OUTPUT_DIR}")
-    file(RENAME "${OUTPUT_DIR}/refman.pdf" "${OUTPUT_DIR}/${DOC_OUTPUT_NAME}.pdf")
-  endif()
-endfunction()
-
-# Main function to set up documentation targets
-function(OCCT_SETUP_DOC_TARGETS)
-  # Check if required tools are available
-  OCCT_DOC_CHECK_TOOLS()
-  if(NOT OCCT_DOC_TOOLS_AVAILABLE)
-    return()
-  endif()
-
-  # Load lists of documentation files
-  OCCT_DOC_LOAD_FILE_LISTS()
-
-  # Collect module information
-  OCCT_DOC_COLLECT_MODULES_INFO()
-
-  # Extract toolkit dependencies
-  OCCT_DOC_EXTRACT_TOOLKIT_DEPENDENCIES()
-
-  # Create documentation output directories
-  set(DOC_ROOT_DIR "${CMAKE_BINARY_DIR}/doc")
-  file(MAKE_DIRECTORY ${DOC_ROOT_DIR})
-
-  # Setup Reference Manual target
-  if(BUILD_DOC_RefMan)
-    # Create output directories
-    set(REFMAN_OUTPUT_DIR "${DOC_ROOT_DIR}/refman")
-    file(MAKE_DIRECTORY ${REFMAN_OUTPUT_DIR})
-    file(MAKE_DIRECTORY "${REFMAN_OUTPUT_DIR}/html")
-
-    # Copy index file to provide fast access to HTML documentation
-    file(COPY "${OCCT_ROOT_DIR}/dox/resources/index.html" DESTINATION "${REFMAN_OUTPUT_DIR}")
-
-    # Generate main page for reference manual
-    OCCT_DOC_GENERATE_MAIN_PAGE(${REFMAN_OUTPUT_DIR} "main_page.dox")
-
-    # Configure Doxygen
-    set(DOC_TYPE "REFMAN")
-    OCCT_DOC_CONFIGURE_DOXYGEN(${REFMAN_OUTPUT_DIR} "Doxyfile" ${DOC_TYPE})
-
-    # Add custom target for reference manual
-    add_custom_target(RefMan
-      COMMAND ${DOXYGEN_EXECUTABLE} ${REFMAN_OUTPUT_DIR}/Doxyfile
-      COMMENT "Generating Reference Manual with Doxygen"
-      WORKING_DIRECTORY ${OCCT_ROOT_DIR}
-      VERBATIM
-    )
-
-    # Add custom command to install generated documentation if required
-    if(INSTALL_DOC_RefMan)
-      install(DIRECTORY "${REFMAN_OUTPUT_DIR}/html/"
-              DESTINATION "${INSTALL_DIR_DOC}/refman/html"
-              OPTIONAL)
-    endif()
-  endif()
-
-  # Setup Overview documentation target (after RefMan so it can use the RefMan tag file)
-  if(BUILD_DOC_Overview)
-    # Create output directories
-    set(OVERVIEW_OUTPUT_DIR "${DOC_ROOT_DIR}/overview")
-    file(MAKE_DIRECTORY ${OVERVIEW_OUTPUT_DIR})
-    file(MAKE_DIRECTORY "${OVERVIEW_OUTPUT_DIR}/html")
-
-    # Configure Doxygen for Overview
-    set(DOC_TYPE "OVERVIEW")
-    OCCT_DOC_CONFIGURE_DOXYGEN(${OVERVIEW_OUTPUT_DIR} "Doxyfile" ${DOC_TYPE})
-
-    # Add custom target for overview documentation
-    add_custom_target(Overview
-      COMMAND ${DOXYGEN_EXECUTABLE} ${OVERVIEW_OUTPUT_DIR}/Doxyfile
-      COMMENT "Generating Overview documentation with Doxygen"
-      WORKING_DIRECTORY ${OCCT_ROOT_DIR}
-      VERBATIM
-    )
-
-    # Copy index file to provide fast access to HTML documentation
-    file(COPY "${OCCT_ROOT_DIR}/dox/resources/index.html" DESTINATION "${OVERVIEW_OUTPUT_DIR}")
-
-    # Add custom command to copy generated documentation to install location if required
-    if(INSTALL_DOC_Overview)
-      install(DIRECTORY "${OVERVIEW_OUTPUT_DIR}/html/"
-              DESTINATION "${INSTALL_DIR_DOC}/overview/html"
-              OPTIONAL)
-
-      # Create overview.html only for windows
-      if(WIN32)
-        install(FILES "${OCCT_ROOT_DIR}/dox/resources/overview.html"
-                DESTINATION "${INSTALL_DIR_DOC}")
-      endif()
-    endif()
-  endif()
-
-  # Combined documentation target
-  if(BUILD_DOC_Overview AND BUILD_DOC_RefMan)
-    add_custom_target(doc ALL
-      DEPENDS RefMan Overview
-      COMMENT "Generating all documentation"
-    )
-    set_property (TARGET Overview PROPERTY FOLDER "Documentation")
-    set_property (TARGET RefMan PROPERTY FOLDER "Documentation")
-    add_dependencies(Overview RefMan) # Ensure Overview uses RefMan tag file
-  elseif(BUILD_DOC_Overview)
-    add_custom_target(doc ALL
-      DEPENDS Overview
-      COMMENT "Generating Overview documentation"
-    )
-    set_property (TARGET Overview PROPERTY FOLDER "Documentation")
-  elseif(BUILD_DOC_RefMan)
-    add_custom_target(doc ALL
-      DEPENDS RefMan
-      COMMENT "Generating Reference Manual"
-    )
-    set_property (TARGET RefMan PROPERTY FOLDER "Documentation")
-  endif()
-  set_property (TARGET doc PROPERTY FOLDER "Documentation")
-endfunction()

adm/cmake/occt_gtest.cmake

@@ -1,245 +0,0 @@
-# Google Test integration for OCCT toolkits
-
-set (TEST_PROJECT_NAME OpenCascadeGTest)
-
-# Initialize Google Test environment and create the target
-function(OCCT_INIT_GTEST)
-  if (NOT GOOGLETEST_FOUND)
-    message(STATUS "Google Test not available. Skipping test project ${TEST_PROJECT_NAME}")
-    return()
-  endif()
-
-  # Initialize test data collections
-  set(OCCT_GTEST_SOURCE_FILES "" PARENT_SCOPE)
-  set(OCCT_GTEST_SOURCE_FILES_ABS "" PARENT_SCOPE)
-  set(OCCT_GTEST_TESTS_LIST "" PARENT_SCOPE)
-
-  # Create the test executable once
-  add_executable(${TEST_PROJECT_NAME})
-
-  set_target_properties(${TEST_PROJECT_NAME} PROPERTIES FOLDER "Testing")
-
-  # Link with Google Test
-  target_link_libraries(${TEST_PROJECT_NAME} PRIVATE GTest::gtest_main)
-
-  # Add pthreads if necessary (for Linux)
-  if (UNIX AND NOT APPLE)
-    target_link_libraries(${TEST_PROJECT_NAME} PRIVATE pthread)
-  endif()
-
-  target_compile_definitions(${TEST_PROJECT_NAME} PRIVATE GTEST_LINKED_AS_SHARED_LIBRARY=1)
-
-  # Link with all active toolkits that are libraries
-  foreach(TOOLKIT ${BUILD_TOOLKITS})
-    if(TARGET ${TOOLKIT})
-      get_target_property(TOOLKIT_TYPE ${TOOLKIT} TYPE)
-      if(TOOLKIT_TYPE STREQUAL "SHARED_LIBRARY" OR TOOLKIT_TYPE STREQUAL "STATIC_LIBRARY")
-        target_link_libraries(${TEST_PROJECT_NAME} PRIVATE ${TOOLKIT})
-      endif()
-    endif()
-  endforeach()
-
-  if (INSTALL_GTEST)
-    # Install the test executable
-    install (TARGETS ${TEST_PROJECT_NAME}
-             DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
-
-    if (EMSCRIPTEN)
-      install(FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${TEST_PROJECT_NAME}.wasm DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
-    endif()
-  endif()
-endfunction()
-
-# Add tests from a specific toolkit to the main test executable
-function(OCCT_COLLECT_TOOLKIT_TESTS TOOLKIT_NAME)
-  # Skip if Google Test is not available or the test executable wasn't created
-  if (NOT GOOGLETEST_FOUND OR NOT TARGET ${TEST_PROJECT_NAME})
-    return()
-  endif()
-
-  # Extract test source files from FILES.cmake
-  set(FILES_CMAKE_PATH "${OCCT_${TOOLKIT_NAME}_FILES_LOCATION}/GTests/FILES.cmake")
-  if(EXISTS "${FILES_CMAKE_PATH}")
-    # Reset toolkit test files list
-    set(OCCT_${TOOLKIT_NAME}_GTests_FILES)
-
-    # Include the toolkit's FILES.cmake which sets OCCT_${TOOLKIT_NAME}_GTests_FILES
-    include("${FILES_CMAKE_PATH}")
-    set(TEST_SOURCE_FILES "${OCCT_${TOOLKIT_NAME}_GTests_FILES}")
-
-    # Skip if no test files found
-    if(NOT TEST_SOURCE_FILES)
-      return()
-    endif()
-
-    # Get module name for test organization
-    get_target_property(TOOLKIT_MODULE ${TOOLKIT_NAME} MODULE)
-    if(NOT TOOLKIT_MODULE)
-      set(TOOLKIT_MODULE "Unknown")
-    endif()
-
-    # Get absolute paths of test source files and add them to the executable
-    set(TEST_SOURCE_FILES_ABS)
-    foreach(TEST_SOURCE_FILE ${TEST_SOURCE_FILES})
-      set(TEST_SOURCE_FILE_ABS "${OCCT_${TOOLKIT_NAME}_GTests_FILES_LOCATION}/${TEST_SOURCE_FILE}")
-      list(APPEND TEST_SOURCE_FILES_ABS "${TEST_SOURCE_FILE_ABS}")
-    endforeach()
-
-    # Add test sources to the executable
-    target_sources(${TEST_PROJECT_NAME} PRIVATE ${TEST_SOURCE_FILES_ABS})
-
-    # Create a more reliable test discovery approach
-    # Use the WORKING_DIRECTORY parameter to ensure proper test execution context
-    gtest_add_tests(
-      TARGET ${TEST_PROJECT_NAME}
-      TEST_PREFIX "${TOOLKIT_MODULE}::${TOOLKIT_NAME}::"
-      SOURCES ${TEST_SOURCE_FILES_ABS}
-      TEST_LIST TOOLKIT_TESTS
-      SKIP_DEPENDENCY
-      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
-    )
-
-    # Configure test output properties to improve result capture
-    foreach(test_name ${TOOLKIT_TESTS})
-      set_tests_properties(${test_name} PROPERTIES
-        # Use proper result detection by checking output and return code
-        PASS_REGULAR_EXPRESSION "\\[  PASSED  \\]"
-        FAIL_REGULAR_EXPRESSION "\\[  FAILED  \\]"
-      )
-    endforeach()
-
-    # Add these tests to the main list so we can set environment for all tests later
-    # Get the existing list first
-    if(DEFINED OCCT_GTEST_TESTS_LIST)
-      set(TEMP_GTEST_TESTS_LIST ${OCCT_GTEST_TESTS_LIST})
-    else()
-      set(TEMP_GTEST_TESTS_LIST "")
-    endif()
-    
-    # Append the new tests
-    list(APPEND TEMP_GTEST_TESTS_LIST ${TOOLKIT_TESTS})
-    
-    # Update the parent scope variable
-    set(OCCT_GTEST_TESTS_LIST "${TEMP_GTEST_TESTS_LIST}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-# Set environment variables for all collected tests
-function(OCCT_SET_GTEST_ENVIRONMENT)
-  if (NOT GOOGLETEST_FOUND OR NOT TARGET ${TEST_PROJECT_NAME})
-    return()
-  endif()
-
-  if (OCCT_GTEST_TESTS_LIST)
-    # Set common environment variables
-    set(TEST_ENVIRONMENT
-      "CSF_LANGUAGE=us"
-      "MMGT_CLEAR=1"
-      "CSF_SHMessage=${OCCT_ROOT_DIR}/resources/SHMessage"
-      "CSF_MDTVTexturesDirectory=${OCCT_ROOT_DIR}/resources/Textures"
-      "CSF_ShadersDirectory=${OCCT_ROOT_DIR}/resources/Shaders"
-      "CSF_XSMessage=${OCCT_ROOT_DIR}/resources/XSMessage"
-      "CSF_TObjMessage=${OCCT_ROOT_DIR}/resources/TObj"
-      "CSF_StandardDefaults=${OCCT_ROOT_DIR}/resources/StdResource"
-      "CSF_PluginDefaults=${OCCT_ROOT_DIR}/resources/StdResource"
-      "CSF_XCAFDefaults=${OCCT_ROOT_DIR}/resources/StdResource"
-      "CSF_TObjDefaults=${OCCT_ROOT_DIR}/resources/StdResource"
-      "CSF_StandardLiteDefaults=${OCCT_ROOT_DIR}/resources/StdResource"
-      "CSF_IGESDefaults=${OCCT_ROOT_DIR}/resources/XSTEPResource"
-      "CSF_STEPDefaults=${OCCT_ROOT_DIR}/resources/XSTEPResource"
-      "CSF_XmlOcafResource=${OCCT_ROOT_DIR}/resources/XmlOcafResource"
-      "CSF_MIGRATION_TYPES=${OCCT_ROOT_DIR}/resources/StdResource/MigrationSheet.txt"
-      "CSF_OCCTResourcePath=${OCCT_ROOT_DIR}/resources"
-      "CSF_OCCTDataPath=${OCCT_ROOT_DIR}/data"
-      "CSF_OCCTDocPath=${OCCT_ROOT_DIR}/doc"
-      "CSF_OCCTSamplesPath=${OCCT_ROOT_DIR}/samples"
-      "CSF_OCCTTestsPath=${OCCT_ROOT_DIR}/tests"
-      "CSF_OCCTBinPath=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
-      "CSF_OCCTLibPath=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}"
-      "CSF_OCCTIncludePath=${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}"
-      "CASROOT=${OCCT_ROOT_DIR}"
-    )
-
-    # Build PATH environment variable
-    set(PATH_ELEMENTS
-      "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
-    )
-
-    # Add 3rdparty paths to PATH
-    if(3RDPARTY_TCL_LIBRARY_DIR)
-      list(APPEND PATH_ELEMENTS "${3RDPARTY_TCL_LIBRARY_DIR}")
-    endif()
-    if(3RDPARTY_TK_LIBRARY_DIR)
-      list(APPEND PATH_ELEMENTS "${3RDPARTY_TK_LIBRARY_DIR}")
-    endif()
-    if(3RDPARTY_FREETYPE_LIBRARY_DIR)
-      list(APPEND PATH_ELEMENTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-    endif()
-    if(3RDPARTY_FREEIMAGE_LIBRARY_DIRS)
-      list(APPEND PATH_ELEMENTS "${3RDPARTY_FREEIMAGE_LIBRARY_DIRS}")
-    endif()
-    if(3RDPARTY_TBB_LIBRARY_DIR)
-      list(APPEND PATH_ELEMENTS "${3RDPARTY_TBB_LIBRARY_DIR}")
-    endif()
-    if(3RDPARTY_VTK_LIBRARY_DIR)
-      list(APPEND PATH_ELEMENTS "${3RDPARTY_VTK_LIBRARY_DIR}")
-    endif()
-    if(3RDPARTY_FFMPEG_LIBRARY_DIR)
-      list(APPEND PATH_ELEMENTS "${3RDPARTY_FFMPEG_LIBRARY_DIR}")
-    endif()
-    if(3RDPARTY_QT_DIR)
-      list(APPEND PATH_ELEMENTS "${3RDPARTY_QT_DIR}/bin")
-    endif()
-    if (3RDPARTY_DLL_DIRS)
-      foreach(DLL_DIR ${3RDPARTY_DLL_DIRS})
-        list(APPEND PATH_ELEMENTS "${DLL_DIR}")
-      endforeach()
-    endif()
-
-    # Create the PATH variable that ctest will use
-    if(WIN32)
-      string(REPLACE ";" "\\;" TEST_PATH_ENV "$ENV{PATH}")
-      string(REPLACE ";" "\\;" PATH_ELEMENTS_STR "${PATH_ELEMENTS}")
-      list(APPEND TEST_ENVIRONMENT "PATH=${PATH_ELEMENTS_STR}\\;${TEST_PATH_ENV}")
-    else()
-      string(REPLACE ";" ":" PATH_ELEMENTS_STR "${PATH_ELEMENTS}")
-      list(APPEND TEST_ENVIRONMENT "PATH=${PATH_ELEMENTS_STR}:$ENV{PATH}")
-
-      # Set LD_LIBRARY_PATH for Unix systems
-      list(APPEND TEST_ENVIRONMENT "LD_LIBRARY_PATH=${PATH_ELEMENTS_STR}:$ENV{LD_LIBRARY_PATH}")
-
-      # Set DYLD_LIBRARY_PATH for macOS
-      if(APPLE)
-        list(APPEND TEST_ENVIRONMENT "DYLD_LIBRARY_PATH=${PATH_ELEMENTS_STR}:$ENV{DYLD_LIBRARY_PATH}")
-      endif()
-    endif()
-
-    # Add DrawResources related environment if it exists
-    if(EXISTS "${OCCT_ROOT_DIR}/resources/DrawResources")
-      list(APPEND TEST_ENVIRONMENT "DRAWHOME=${OCCT_ROOT_DIR}/resources/DrawResources")
-      list(APPEND TEST_ENVIRONMENT "CSF_DrawPluginDefaults=${OCCT_ROOT_DIR}/resources/DrawResources")
-
-      if(EXISTS "${OCCT_ROOT_DIR}/resources/DrawResources/DrawDefault")
-        list(APPEND TEST_ENVIRONMENT "DRAWDEFAULT=${OCCT_ROOT_DIR}/resources/DrawResources/DrawDefault")
-      endif()
-    endif()
-
-    # Set FPE signal handler if enabled
-    if(BUILD_ENABLE_FPE_SIGNAL_HANDLER)
-      list(APPEND TEST_ENVIRONMENT "CSF_FPE=1")
-    endif()
-
-    # Set TCL/TK library paths if they differ
-    if(3RDPARTY_TCL_LIBRARY_DIR AND 3RDPARTY_TK_LIBRARY_DIR AND NOT 3RDPARTY_TCL_LIBRARY_DIR STREQUAL 3RDPARTY_TK_LIBRARY_DIR)
-      if(3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT)
-        list(APPEND TEST_ENVIRONMENT "TCL_LIBRARY=${3RDPARTY_TCL_LIBRARY_DIR}/../lib/tcl${3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT}")
-      endif()
-      if(3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT)
-        list(APPEND TEST_ENVIRONMENT "TK_LIBRARY=${3RDPARTY_TK_LIBRARY_DIR}/../lib/tk${3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT}")
-      endif()
-    endif()
-
-    # Set environment for all tests in the project
-    set_tests_properties(${OCCT_GTEST_TESTS_LIST} PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}")
-  endif()
-endfunction()

adm/cmake/occt_macros.cmake

@@ -3,9 +3,9 @@
 if(OCCT_MACROS_ALREADY_INCLUDED)
   return()
 endif()
-
 set(OCCT_MACROS_ALREADY_INCLUDED 1)
 
+
 macro (OCCT_CHECK_AND_UNSET VARNAME)
   if (DEFINED ${VARNAME})
     unset (${VARNAME} CACHE)
@@ -34,16 +34,20 @@ endmacro()
 
 function (FILE_TO_LIST FILE_NAME FILE_CONTENT)
   set (LOCAL_FILE_CONTENT)
-  if (EXISTS "${OCCT_ROOT_DIR}/${FILE_NAME}")
-    file (STRINGS "${OCCT_ROOT_DIR}/${FILE_NAME}" 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}")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
   endif()
 
   set (${FILE_CONTENT} ${LOCAL_FILE_CONTENT} PARENT_SCOPE)
 endfunction()
 
 function(FIND_FOLDER_OR_FILE FILE_OR_FOLDER_NAME RESULT_PATH)
-  if (EXISTS "${OCCT_ROOT_DIR}/${FILE_OR_FOLDER_NAME}")
-    set (${RESULT_PATH} "${OCCT_ROOT_DIR}/${FILE_OR_FOLDER_NAME}" PARENT_SCOPE)
+  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}")
+    set (${RESULT_PATH} "${CMAKE_SOURCE_DIR}/${FILE_OR_FOLDER_NAME}" PARENT_SCOPE)
   else()
     set (${RESULT_PATH} "" PARENT_SCOPE)
   endif()
@@ -71,45 +75,37 @@ endmacro()
 # COMPILER variable
 macro (OCCT_MAKE_COMPILER_SHORT_NAME)
   if (MSVC)
-    if (MSVC_VERSION LESS 1914)
-      message (FATAL_ERROR "Microsoft Visual C++ 19.14 (VS 2017 15.7) or newer is required for C++17 support")
-    endif()
-    if ((MSVC_VERSION GREATER 1900) AND (MSVC_VERSION LESS 2000))
+    if ((MSVC_VERSION EQUAL 1300) OR (MSVC_VERSION EQUAL 1310))
+      set (COMPILER vc7)
+    elseif (MSVC_VERSION EQUAL 1400)
+      set (COMPILER vc8)
+    elseif (MSVC_VERSION EQUAL 1500)
+      set (COMPILER vc9)
+    elseif (MSVC_VERSION EQUAL 1600)
+      set (COMPILER vc10)
+    elseif (MSVC_VERSION EQUAL 1700)
+      set (COMPILER vc11)
+    elseif (MSVC_VERSION EQUAL 1800)
+      set (COMPILER vc12)
+    elseif (MSVC_VERSION EQUAL 1900)
+      set (COMPILER vc14)
+    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 compatible
+      # we keep its id as "vc14" to be compatibille
       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 (FATAL_ERROR "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 (FATAL_ERROR "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 (FATAL_ERROR "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 (FATAL_ERROR "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 (FATAL_ERROR "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()
@@ -156,8 +152,25 @@ function (FIND_SUBDIRECTORY ROOT_DIRECTORY DIRECTORY_SUFFIX SUBDIRECTORY_NAME)
 endfunction()
 
 function (OCCT_ORIGIN_AND_PATCHED_FILES RELATIVE_PATH SEARCH_TEMPLATE RESULT)
-  file (GLOB ORIGIN_FILES "${OCCT_ROOT_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
-  set (${RESULT} ${ORIGIN_FILES} PARENT_SCOPE)
+
+  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)
 endfunction()
 
 function (FILLUP_PRODUCT_SEARCH_TEMPLATE PRODUCT_NAME COMPILER COMPILER_BITNESS SEARCH_TEMPLATES)
@@ -213,31 +226,60 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
 endfunction()
 
 macro (OCCT_INSTALL_FILE_OR_DIR BEING_INSTALLED_OBJECT DESTINATION_PATH)
-  if (IS_DIRECTORY "${OCCT_ROOT_DIR}/${BEING_INSTALLED_OBJECT}")
-    install (DIRECTORY "${OCCT_ROOT_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${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()
   else()
-    install (FILES     "${OCCT_ROOT_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    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()
   endif()
 endmacro()
 
 macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE BUILD_NAME INSTALL_NAME DESTINATION_PATH)
-  configure_file("${OCCT_ROOT_DIR}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY)
+  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()
+
   install(FILES "${OCCT_BINARY_DIR}/${BUILD_NAME}" DESTINATION  "${DESTINATION_PATH}" RENAME ${INSTALL_NAME})
 endmacro()
 
 function (EXTRACT_TOOLKIT_PACKAGES RELATIVE_PATH OCCT_TOOLKIT RESULT_PACKAGES)
-  set (${RESULT_PACKAGES} ${OCCT_${OCCT_TOOLKIT}_LIST_OF_PACKAGES} PARENT_SCOPE)
+  set (OCCT_TOOLKIT_PACKAGES "")
+  get_property(OCCT_TOOLKIT_PACKAGES GLOBAL PROPERTY OCCT_TOOLKIT_${OCCT_TOOLKIT}_PACKAGES)
+  if (OCCT_TOOLKIT_PACKAGES)
+    set (${RESULT_PACKAGES} ${OCCT_TOOLKIT_PACKAGES} PARENT_SCOPE)
+    return()
+  endif()
+  FILE_TO_LIST ("${RELATIVE_PATH}/${OCCT_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
+  set (${RESULT_PACKAGES} ${OCCT_TOOLKIT_PACKAGES} PARENT_SCOPE)
+  set_property(GLOBAL PROPERTY OCCT_TOOLKIT_${OCCT_TOOLKIT}_PACKAGES "${OCCT_TOOLKIT_PACKAGES}")
 endfunction()
 
 function(EXTRACT_TOOLKIT_EXTERNLIB RELATIVE_PATH OCCT_TOOLKIT RESULT_LIBS)
-  set (${RESULT_LIBS} ${OCCT_${OCCT_TOOLKIT}_EXTERNAL_LIBS} PARENT_SCOPE)
+  set (OCCT_TOOLKIT_LIBS "")
+  get_property(OCCT_TOOLKIT_LIBS GLOBAL PROPERTY OCCT_TOOLKIT_${OCCT_TOOLKIT}_LIBS)
+  if (OCCT_TOOLKIT_LIBS)
+    set (${RESULT_LIBS} ${OCCT_TOOLKIT_LIBS} PARENT_SCOPE)
+    return()
+  endif()
+  FILE_TO_LIST ("${RELATIVE_PATH}/${OCCT_TOOLKIT}/EXTERNLIB" OCCT_TOOLKIT_LIBS)
+  set (${RESULT_LIBS} ${OCCT_TOOLKIT_LIBS} PARENT_SCOPE)
+  set_property(GLOBAL PROPERTY OCCT_TOOLKIT_${OCCT_TOOLKIT}_LIBS "${OCCT_TOOLKIT_LIBS}")
 endfunction()
 
 function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_INCLUDE_FOLDER)
-
-  # Package name can be relative path, need to get only the name of the final element
-  get_filename_component (OCCT_PACKAGE ${OCCT_PACKAGE} NAME)
-
   # package name is not unique, it can be reuse in tools and src,
   # use extra parameter as relative path to distinguish between them
   set (OCCT_PACKAGE_FILES "")
@@ -249,20 +291,32 @@ function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_I
     return()
   endif()
 
-  set (OCCT_PACKAGE_INCLUDE_DIR "${OCCT_${OCCT_PACKAGE}_FILES_LOCATION}")
-  set (OCCT_PACKAGE_FILES "${OCCT_${OCCT_PACKAGE}_FILES}")
+  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")
+    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()
 
-  # collect and search for the files in the package directory or patched one
-  # FILE only contains filename that must to be inside package or patched directory
+  # collect and searach for the files in the package directory or patached one
+  # FILE contains inly filename that must to be inside package or patched directory
   set (FILE_PATH_LIST)
 
   foreach (OCCT_FILE ${OCCT_PACKAGE_FILES})
     string (REGEX REPLACE "[^:]+:+" "" OCCT_FILE "${OCCT_FILE}")
-    list (APPEND FILE_PATH_LIST "${OCCT_PACKAGE_INCLUDE_DIR}/${OCCT_FILE}")
+    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}")
+    endif()
   endforeach()
 
   if (NOT FILE_PATH_LIST)
-    message (WARNING "FILES has not been found in ${OCCT_PACKAGE_INCLUDE_DIR} for package ${OCCT_PACKAGE}")
+    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()
   endif()
 
   set (${RESULT_FILES} ${FILE_PATH_LIST} PARENT_SCOPE)
@@ -271,11 +325,7 @@ function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_I
   set_property(GLOBAL PROPERTY OCCT_PACKAGE_${RELATIVE_PATH}_${OCCT_PACKAGE}_INCLUDE_DIR "${OCCT_PACKAGE_INCLUDE_DIR}")
 endfunction()
 
-# SOLUTION_TYPE: MODULES, TOOLS, SAMPLES
-# OCCT_TOOLKIT: TK*
-# RESULT_TKS_AS_DEPS: TK* dependencies
-# RESULT_INCLUDE_FOLDERS: include folders
-function(EXCTRACT_TOOLKIT_DEPS SOLUTION_TYPE OCCT_TOOLKIT RESULT_TKS_AS_DEPS RESULT_INCLUDE_FOLDERS)
+function(EXCTRACT_TOOLKIT_DEPS RELATIVE_PATH OCCT_TOOLKIT RESULT_TKS_AS_DEPS RESULT_INCLUDE_FOLDERS)
   set (OCCT_TOOLKIT_DEPS "")
   set (OCCT_TOOLKIT_INCLUDE_FOLDERS "")
   get_property(OCCT_TOOLKIT_DEPS GLOBAL PROPERTY OCCT_TOOLKIT_${OCCT_TOOLKIT}_DEPS)
@@ -286,7 +336,7 @@ function(EXCTRACT_TOOLKIT_DEPS SOLUTION_TYPE OCCT_TOOLKIT RESULT_TKS_AS_DEPS RES
     return()
   endif()
   set (EXTERNAL_LIBS)
-  EXTRACT_TOOLKIT_EXTERNLIB (${SOLUTION_TYPE} ${OCCT_TOOLKIT} EXTERNAL_LIBS)
+  EXTRACT_TOOLKIT_EXTERNLIB (${RELATIVE_PATH} ${OCCT_TOOLKIT} EXTERNAL_LIBS)
   foreach (EXTERNAL_LIB ${EXTERNAL_LIBS})
     string (REGEX MATCH "^TK" TK_FOUND ${EXTERNAL_LIB})
     if (TK_FOUND)
@@ -295,9 +345,9 @@ function(EXCTRACT_TOOLKIT_DEPS SOLUTION_TYPE OCCT_TOOLKIT RESULT_TKS_AS_DEPS RES
   endforeach()
 
   set (OCCT_TOOLKIT_PACKAGES)
-  EXTRACT_TOOLKIT_PACKAGES (${SOLUTION_TYPE} ${OCCT_TOOLKIT} OCCT_TOOLKIT_PACKAGES)
+  EXTRACT_TOOLKIT_PACKAGES (${RELATIVE_PATH} ${OCCT_TOOLKIT} OCCT_TOOLKIT_PACKAGES)
   foreach(OCCT_PACKAGE ${OCCT_TOOLKIT_PACKAGES})
-    EXTRACT_PACKAGE_FILES (${SOLUTION_TYPE} ${OCCT_PACKAGE} OCCT_PACKAGE_FILES OCCT_PACKAGE_INCLUDE_DIR)
+    EXTRACT_PACKAGE_FILES (${RELATIVE_PATH} ${OCCT_PACKAGE} OCCT_PACKAGE_FILES OCCT_PACKAGE_INCLUDE_DIR)
     list (APPEND OCCT_TOOLKIT_INCLUDE_FOLDERS ${OCCT_PACKAGE_INCLUDE_DIR})
   endforeach()
 
@@ -307,11 +357,7 @@ function(EXCTRACT_TOOLKIT_DEPS SOLUTION_TYPE OCCT_TOOLKIT RESULT_TKS_AS_DEPS RES
   set_property(GLOBAL PROPERTY OCCT_TOOLKIT_${OCCT_TOOLKIT}_INCLUDE_FOLDERS "${OCCT_TOOLKIT_INCLUDE_FOLDERS}")
 endfunction()
 
-# SOLUTION_TYPE: MODULES, TOOLS, SAMPLES
-# OCCT_TOOLKIT: TK*
-# RESULT_TKS_AS_DEPS: list of TK* dependencies
-# RESULT_INCLUDE_FOLDERS: list of include folders
-function(EXCTRACT_TOOLKIT_FULL_DEPS SOLUTION_TYPE OCCT_TOOLKIT RESULT_TKS_AS_DEPS RESULT_INCLUDE_FOLDERS)
+function(EXCTRACT_TOOLKIT_FULL_DEPS RELATIVE_PATH OCCT_TOOLKIT RESULT_TKS_AS_DEPS RESULT_INCLUDE_FOLDERS)
   set (OCCT_TOOLKIT_DEPS "")
   set (OCCT_TOOLKIT_INCLUDE_FOLDERS "")
   get_property(OCCT_TOOLKIT_DEPS GLOBAL PROPERTY OCCT_TOOLKIT_${OCCT_TOOLKIT}_FULL_DEPS)
@@ -322,12 +368,12 @@ function(EXCTRACT_TOOLKIT_FULL_DEPS SOLUTION_TYPE OCCT_TOOLKIT RESULT_TKS_AS_DEP
     return()
   endif()
 
-  EXCTRACT_TOOLKIT_DEPS(${SOLUTION_TYPE} ${OCCT_TOOLKIT} OCCT_TOOLKIT_DEPS OCCT_TOOLKIT_INCLUDE_DIR)
+  EXCTRACT_TOOLKIT_DEPS(${RELATIVE_PATH} ${OCCT_TOOLKIT} OCCT_TOOLKIT_DEPS OCCT_TOOLKIT_INCLUDE_DIR)
   list(APPEND OCCT_TOOLKIT_FULL_DEPS ${OCCT_TOOLKIT_DEPS})
   list(APPEND OCCT_TOOLKIT_INCLUDE_FOLDERS ${OCCT_TOOLKIT_INCLUDE_DIR})
 
   foreach(DEP ${OCCT_TOOLKIT_DEPS})
-    EXCTRACT_TOOLKIT_FULL_DEPS(${SOLUTION_TYPE} ${DEP} DEP_TOOLKIT_DEPS DEP_INCLUDE_DIRS)
+    EXCTRACT_TOOLKIT_FULL_DEPS(${RELATIVE_PATH} ${DEP} DEP_TOOLKIT_DEPS DEP_INCLUDE_DIRS)
     list(APPEND OCCT_TOOLKIT_FULL_DEPS ${DEP_TOOLKIT_DEPS})
     list(APPEND OCCT_TOOLKIT_INCLUDE_FOLDERS ${DEP_INCLUDE_DIRS})
   endforeach()
@@ -343,8 +389,10 @@ endfunction()
 
 function (FILE_TO_LIST FILE_NAME FILE_CONTENT)
   set (LOCAL_FILE_CONTENT)
-  if (EXISTS "${OCCT_ROOT_DIR}/${FILE_NAME}")
-    file (STRINGS "${OCCT_ROOT_DIR}/${FILE_NAME}" 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}")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
   endif()
 
   set (${FILE_CONTENT} ${LOCAL_FILE_CONTENT} PARENT_SCOPE)
@@ -354,7 +402,10 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_ROOT_TARGET_OCCT_DIR THE_OCC
   set (OCCT_USED_PACKAGES)
 
   # consider patched header.in template
-  set (TEMPLATE_HEADER_PATH "${OCCT_ROOT_DIR}/adm/templates/header.in")
+  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})
@@ -363,94 +414,56 @@ 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|g|p|lxx|hxx|pxx|hpp|gxx)$")
+      list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|lxx|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)
-    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()
+    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)
     endif()
   endforeach()
 
-  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}")
+  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}")
 endfunction()
 
-# 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)
+function(ADD_PRECOMPILED_HEADER INPUT_TARGET PRECOMPILED_HEADER)
   if (NOT BUILD_USE_PCH)
     return()
   endif()
-
-  # 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()
+  target_precompile_headers(${INPUT_TARGET} PUBLIC "$<$<COMPILE_LANGUAGE:CXX>:${PRECOMPILED_HEADER}>")
 endfunction()
 
 macro (OCCT_COPY_FILE_OR_DIR BEING_COPIED_OBJECT DESTINATION_PATH)
   # first of all, copy original files
-  if (EXISTS "${OCCT_ROOT_DIR}/${BEING_COPIED_OBJECT}")
-    file (COPY "${OCCT_ROOT_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${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)
-  configure_file("${OCCT_ROOT_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  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()
 endmacro()
 
 macro (OCCT_ADD_SUBDIRECTORY BEING_ADDED_DIRECTORY)
-  if (EXISTS "${OCCT_ROOT_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
-    add_subdirectory (${OCCT_ROOT_DIR}/${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")
+    add_subdirectory (${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY})
   else()
     message (STATUS "${BEING_ADDED_DIRECTORY} directory is not included")
   endif()
@@ -507,80 +520,42 @@ function (OCCT_MODULES_AND_TOOLKITS FILE_NAME TOOLKITS_NAME_SUFFIX MODULE_LIST)
   set (${MODULE_LIST} ${${MODULE_LIST}} PARENT_SCOPE)
 endfunction()
 
-
-# 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 ${OCCT_ROOT_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 ${OCCT_ROOT_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
+# Returns OCC version string from file Standard_Version.hxx (if available)
 function (OCC_VERSION OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE OCC_VERSION_DEVELOPMENT OCC_VERSION_STRING_EXT)
 
-  include (version)
-  set (OCC_VERSION_COMPLETE "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
-  set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}")
+  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()
 
+  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 (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 (OCC_VERSION_DEVELOPMENT "${OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
   
-  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)
+  if (OCC_VERSION_DEVELOPMENT AND OCC_VERSION_COMPLETE)
+    set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}.${OCC_VERSION_DEVELOPMENT}" PARENT_SCOPE)
   else()
-    OCCT_CHECK_AND_UNSET(USE_GIT_HASH)
+    set (OCC_VERSION_STRING_EXT "${OCC_VERSION_COMPLETE}" PARENT_SCOPE)
   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)
@@ -630,7 +605,7 @@ macro (FLEX_AND_BISON_TARGET_APPLY THE_PACKAGE_NAME RELATIVE_SOURCES_DIR)
       continue()
     endif()
     # Note: files are generated in original source directory (not in patch!)
-    set (FLEX_BISON_TARGET_DIR "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${THE_PACKAGE_NAME}")
+    set (FLEX_BISON_TARGET_DIR "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${THE_PACKAGE_NAME}")
     # choose appropriate extension for generated files: "cxx" if source file contains
     # instruction to generate C++ code, "c" otherwise
     set (BISON_OUTPUT_FILE_EXT "c")
@@ -664,7 +639,7 @@ macro (FLEX_AND_BISON_TARGET_APPLY THE_PACKAGE_NAME RELATIVE_SOURCES_DIR)
       file(REMOVE ${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE})
     endif()
     BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} "${FLEX_BISON_TARGET_DIR}/${BISON_OUTPUT_FILE}"
-                  COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME} -l -M ${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/=")
+                  COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME} -l -M ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/=")
     FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} "${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE}"
                   COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME} -L")
     ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
@@ -684,7 +659,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 \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+  file (GLOB ALL_OCCT_TARGET_FILES \"${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}\")
@@ -696,17 +671,13 @@ macro (OCCT_UPDATE_TARGET_FILE)
 endmacro()
 
 macro (OCCT_INSERT_CODE_FOR_TARGET)
-  if (LAYOUT_IS_VCPKG)
-    install(CODE "set (OCCT_INSTALL_BIN_LETTER \"\")")
-  else()
-    install(CODE "if (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$\")
-      set (OCCT_INSTALL_BIN_LETTER \"\")
-    elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\")
-      set (OCCT_INSTALL_BIN_LETTER \"i\")
-    elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
-      set (OCCT_INSTALL_BIN_LETTER \"d\")
-    endif()")
-  endif()
+  install(CODE "if (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$\")
+    set (OCCT_INSTALL_BIN_LETTER \"\")
+  elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\")
+    set (OCCT_INSTALL_BIN_LETTER \"i\")
+  elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
+    set (OCCT_INSTALL_BIN_LETTER \"d\")
+  endif()")
 endmacro()
 
 macro (OCCT_UPDATE_DRAW_DEFAULT_FILE)
@@ -728,126 +699,3 @@ 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_resources.cmake

@@ -3,8 +3,8 @@
 macro (OCCT_GENERATE_CONTENT_ONLY CurrentResource)
   set (RESOURCE_FILES)
   set (isResDirectory FALSE)
-  if (IS_DIRECTORY "${OCCT_ROOT_DIR}/resources/${CurrentResource}")
-    file (STRINGS "${OCCT_ROOT_DIR}/resources/${CurrentResource}/FILES" RESOURCE_FILES)
+  if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/src/${CurrentResource}")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource}/FILES" RESOURCE_FILES)
     set (CurrentResource_Directory "${CurrentResource}")
     set (isResDirectory TRUE)
   else()
@@ -27,23 +27,37 @@ macro (OCCT_GENERATE_CONTENT_ONLY CurrentResource)
         string (REPLACE "." "_" CurrentResource_FileName "${CurrentResource_FileName}")
         set (HEADER_FILE_NAME "${CurrentResource_Directory}_${CurrentResource_FileName}.pxx")
 
-        message(STATUS "Info. Generating header file from resource file: ${OCCT_ROOT_DIR}/resources/${CurrentResource_Directory}/${RESOURCE_FILE}")
-        # generate content for header file
-        set (OCCT_HEADER_FILE_CONTENT "// This file has been automatically generated from resource file resources/${CurrentResource_Directory}/${RESOURCE_FILE}\n\n")
-        # read resource file
-        file (STRINGS "${OCCT_ROOT_DIR}/resources/${CurrentResource_Directory}/${RESOURCE_FILE}" RESOURCE_FILE_LINES_LIST)
-        set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}static const char ${CurrentResource_Directory}_${CurrentResource_FileName}[] =")
-        foreach (line IN LISTS RESOURCE_FILE_LINES_LIST)
-          string (REPLACE "\"" "\\\"" line "${line}")
-          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}\n  \"${line}\\n\"")
-        endforeach()
-        set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT};\n\n")
-        # Save generated content to header file
-        set (HEADER_FILE "${OCCT_${CurrentResource_Directory}_FILES_LOCATION}/${HEADER_FILE_NAME}")
-        if (EXISTS "${HEADER_FILE}")
-          file (REMOVE "${HEADER_FILE}")
+        set (toProcessResFile TRUE)
+        if (isResDirectory)
+          list (FIND RESOURCE_FILES "${HEADER_FILE_NAME}" aResIndex)
+          if ("${aResIndex}" STREQUAL "-1")
+            set (toProcessResFile FALSE)
+          endif()
+        endif()
+
+        if (toProcessResFile)
+          message(STATUS "Info. Generating header file from resource file: ${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}")
+
+          # generate content for header file
+          set (OCCT_HEADER_FILE_CONTENT "// This file has been automatically generated from resource file src/${CurrentResource_Directory}/${RESOURCE_FILE}\n\n")
+
+          # read resource file
+          file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}" RESOURCE_FILE_LINES_LIST)
+
+          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}static const char ${CurrentResource_Directory}_${CurrentResource_FileName}[] =")
+          foreach (line IN LISTS RESOURCE_FILE_LINES_LIST)
+            string (REPLACE "\"" "\\\"" line "${line}")
+            set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}\n  \"${line}\\n\"")
+          endforeach()
+          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT};")
+
+          # Save generated content to header file
+          set (HEADER_FILE "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${HEADER_FILE_NAME}")
+          if (EXISTS "${HEADER_FILE}")
+            file (REMOVE "${HEADER_FILE}")
+          endif()
+          configure_file ("${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${HEADER_FILE}" @ONLY NEWLINE_STYLE LF)
         endif()
-        configure_file ("${OCCT_ROOT_DIR}/adm/templates/header.in" "${HEADER_FILE}" @ONLY NEWLINE_STYLE LF)
       endif()
     endforeach()
   endif()

adm/cmake/occt_toolkit.cmake

@@ -28,6 +28,9 @@ if ("${USED_PACKAGES}" STREQUAL "")
   set (USED_PACKAGES ${PROJECT_NAME})
 endif()
 
+set (PROJECT_LIBRARIES_DEBUG)
+set (PROJECT_LIBRARIES_RELEASE)
+
 if (USE_QT)
   # Qt dependencies
   OCCT_INCLUDE_CMAKE_FILE (adm/cmake/qt_macro)
@@ -56,6 +59,10 @@ 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)
 
@@ -63,13 +70,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|p|g|lxx|hxx|pxx|hpp|gxx)$")
-    
+  
+  list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|lxx|gxx)")
+  
   if(APPLE)
-    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|cxx|cpp|mm)$")
+    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|mm)")
   else()
-    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|cpp|cxx)$")
+    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c)")
   endif()
 
   list (APPEND HEADER_FILES ${HEADER_FILES_FILTERING})
@@ -96,7 +103,12 @@ string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
 set (USED_RCFILE "")
 if (MSVC)
   set (USED_RCFILE "${CMAKE_BINARY_DIR}/resources/${PROJECT_NAME}.rc")
-  configure_file("${OCCT_ROOT_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
+
+  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()
 endif()
 
 set (CURRENT_MODULE)
@@ -120,13 +132,8 @@ endif (USE_QT)
 if (EXECUTABLE_PROJECT)
   add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
 
-  if (LAYOUT_IS_VCPKG)
-    install (TARGETS ${PROJECT_NAME}
-             DESTINATION "$<IF:$<CONFIG:Debug>,debug/${INSTALL_DIR_BIN},${INSTALL_DIR_BIN}>")
-  else()
-    install (TARGETS ${PROJECT_NAME}
-             DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
-  endif()
+  install (TARGETS ${PROJECT_NAME}
+           DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
 
   if (EMSCRIPTEN)
     install(FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.wasm DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
@@ -134,7 +141,7 @@ if (EXECUTABLE_PROJECT)
 else()
   add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
 
-  if (MSVC AND BUILD_SHARED_LIBS)
+  if (MSVC)
     if (BUILD_FORCE_RelWithDebInfo)
       set (aReleasePdbConf "Release")
     else()
@@ -156,21 +163,12 @@ else()
     set (CMAKE_SHARED_LIBRARY_SUFFIX "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
   endif()
 
-  if (LAYOUT_IS_VCPKG)
-    install (TARGETS ${PROJECT_NAME}
-             EXPORT OpenCASCADE${CURRENT_MODULE}Targets
-             RUNTIME DESTINATION "$<IF:$<CONFIG:Debug>,debug/${INSTALL_DIR_BIN},${INSTALL_DIR_BIN}>"
-             ARCHIVE DESTINATION "$<IF:$<CONFIG:Debug>,debug/${INSTALL_DIR_LIB},${INSTALL_DIR_LIB}>"
-             LIBRARY DESTINATION "$<IF:$<CONFIG:Debug>,debug/${INSTALL_DIR_LIB},${INSTALL_DIR_LIB}>"
-             INCLUDES DESTINATION ${INSTALL_DIR_INCLUDE})
-  else()
-    install (TARGETS ${PROJECT_NAME}
-             EXPORT OpenCASCADE${CURRENT_MODULE}Targets
-             RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
-             ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
-             LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
-             INCLUDES DESTINATION ${INSTALL_DIR_INCLUDE})
-  endif()
+  install (TARGETS ${PROJECT_NAME}
+           EXPORT OpenCASCADE${CURRENT_MODULE}Targets
+           RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
+           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
+           LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
+           INCLUDES DESTINATION ${INSTALL_DIR_INCLUDE})
 
   if (NOT WIN32)
     if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
@@ -203,13 +201,14 @@ elseif (BUILD_SOVERSION_NUMBERS GREATER 1)
 elseif (BUILD_SOVERSION_NUMBERS GREATER 0)
   set (OCC_SOVERSION "${OCC_VERSION_MAJOR}")
 endif()
-
 set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}"
                                                   SOVERSION     "${OCC_SOVERSION}"
                                                   VERSION       "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
 
 set (USED_TOOLKITS_BY_CURRENT_PROJECT)
+set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
 set (USED_EXTERNLIB_AND_TOOLKITS)
+set (USED_PROJECT_LIBRARIES)
 
 # SOME EXECUTABLE PROJECTS MAY USE CUSTOM TOOLKITS AND EXTERNAL LIBRARIES
 if (CUSTOM_EXTERNLIB)
@@ -253,9 +252,55 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
   if ("${CURRENT_CSF}" STREQUAL "${CSF_OpenGlesLibs}")
     add_definitions (-DHAVE_GLES2)
   endif()
-  PROCESS_CSF_LIBRARIES ("${CURRENT_CSF}" USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT "${PROJECT_NAME}")
+  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}(_debug|_release)*$" IS_ENDING "${CACHE_VARIABLE}")
+        string (REGEX MATCH "^([a-z]+)" CSF_WO_VERSION "${CSF_LIBRARY}")
+        string (REGEX MATCH "_${CSF_WO_VERSION}(_debug|_release)*$" 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")
+          string (REGEX MATCH "_debug$" IS_DEBUG "${CACHE_VARIABLE}")
+          list (APPEND USED_PROJECT_LIBRARIES "${CSF_LIBRARY}")
+          if ("x${IS_DEBUG}" STREQUAL "x")
+            list (APPEND PROJECT_LIBRARIES_RELEASE "${CURRENT_CACHE_LIBRARY}")
+            set  (USED_PROJECT_LIBRARY_${CSF_LIBRARY}_RELEASE "${CURRENT_CACHE_LIBRARY}")
+          else()
+            list (APPEND PROJECT_LIBRARIES_DEBUG   "${CURRENT_CACHE_LIBRARY}")
+            set  (USED_PROJECT_LIBRARY_${CSF_LIBRARY}_DEBUG "${CURRENT_CACHE_LIBRARY}")
+          endif()
+          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()
 endforeach()
 
+foreach (USED_ITEM ${USED_PROJECT_LIBRARIES})
+  if (USED_PROJECT_LIBRARY_${USED_ITEM}_RELEASE AND NOT USED_PROJECT_LIBRARY_${USED_ITEM}_DEBUG)
+    list (APPEND PROJECT_LIBRARIES_DEBUG "${USED_PROJECT_LIBRARY_${USED_ITEM}_RELEASE}")
+  endif()
+  unset (USED_PROJECT_LIBRARY_${CSF_LIBRARY}_RELEASE)
+  unset (USED_PROJECT_LIBRARY_${CSF_LIBRARY}_DEBUG)
+endforeach()
+unset (USED_PROJECT_LIBRARIES)
+
 if (APPLE)
   list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
   if (NOT ${IS_X11_FOUND} EQUAL -1)
@@ -291,20 +336,19 @@ else()
   endif()
 endif()
 
-if(IS_VTK_9XX)
-  string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
+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()
 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} PRIVATE debug ${PROJECT_LIBRARY_DEBUG})
-  endforeach()
-  foreach (PROJECT_LIBRARY_RELEASE ${PROJECT_LIBRARIES_RELEASE})
-    target_link_libraries (${PROJECT_NAME} PRIVATE optimized ${PROJECT_LIBRARY_RELEASE})
-  endforeach()
-endif()
+foreach (PROJECT_LIBRARY_DEBUG ${PROJECT_LIBRARIES_DEBUG})
+  target_link_libraries (${PROJECT_NAME} debug ${PROJECT_LIBRARY_DEBUG})
+endforeach()
+foreach (PROJECT_LIBRARY_RELEASE ${PROJECT_LIBRARIES_RELEASE})
+  target_link_libraries (${PROJECT_NAME} optimized ${PROJECT_LIBRARY_RELEASE})
+endforeach()
 
 # suppress deprecation warnings inside OCCT itself for old gcc versions with unavailable Standard_DISABLE_DEPRECATION_WARNINGS
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)

adm/cmake/occt_toolkit_prepare_sample.cmake

@@ -0,0 +1,18 @@
+if ("${TARGET_FOLDER}" STREQUAL "")
+  set (EXECUTABLE_PROJECT ON)
+  set (USE_QT ON)
+
+  set (RELATIVE_DIR "samples/qt")
+  set (MODULES_LIST ${OCCT_SAMPLES})
+  set (TARGET_FOLDER "Samples")
+  set (TOOLKITS_NAME_SUFFIX "SAMPLES_TOOLKITS")
+
+  include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
+else()
+  unset (USE_QT)
+  unset (RELATIVE_DIR)
+  unset (EXECUTABLE_PROJECT)
+  unset (MODULES_LIST)
+  unset (TARGET_FOLDER)
+  unset (TOOLKITS_NAME_SUFFIX)
+endif("${TARGET_FOLDER}" STREQUAL "")

adm/cmake/occt_toolkit_prepare_tool.cmake

@@ -0,0 +1,13 @@
+if ("${TARGET_FOLDER}" STREQUAL "")
+  set (USE_QT ON)
+  set (RELATIVE_DIR "tools")
+  set (MODULES_LIST ${OCCT_TOOLS})
+  set (TARGET_FOLDER "Tools")
+  set (TOOLKITS_NAME_SUFFIX "TOOL_TOOLKITS")
+else()
+  unset (USE_QT)
+  unset (RELATIVE_DIR)
+  unset (MODULES_LIST)
+  unset (TARGET_FOLDER)
+  unset (TOOLKITS_NAME_SUFFIX)
+endif("${TARGET_FOLDER}" STREQUAL "")

adm/cmake/openvr.cmake

@@ -2,17 +2,4 @@
 # 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,54 +3,38 @@
 # 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")
-    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)
+    message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR")
   endif()
-endif()
 
-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)
-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)
+  # 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}")
 
-if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}/bin")
+# 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 (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")
+endif()
+
+if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}")
   list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
 else()
   list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR)

adm/cmake/qt_macro.cmake

@@ -79,24 +79,8 @@ macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES)
 endmacro()
 
 macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
-  # Package name is now the sample name (e.g., "Tutorial")
-  set(PACKAGE_NAME ${OCCT_PACKAGE})
-  
-  # Get files from CMAKE variables with proper location
-  set(ALL_FILES ${OCCT_${PACKAGE_NAME}_FILES})
-  set(FILES_LOCATION ${OCCT_${PACKAGE_NAME}_FILES_LOCATION})
-  
-  # Filter for .ts and .qrc files with full paths
-  set(TS_FILES)
-  set(QRC_FILES)
-  foreach(FILE ${ALL_FILES})
-    if(FILE MATCHES ".+[.]ts$")
-      list(APPEND TS_FILES "${FILES_LOCATION}/${FILE}")
-    endif()
-    if(FILE MATCHES ".+[.]qrc$")
-      list(APPEND QRC_FILES "${FILES_LOCATION}/${FILE}")
-    endif()
-  endforeach()
+  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   TS_FILES   REGEX ".+[.]ts")
+  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   QRC_FILES  REGEX ".+[.]qrc")
 
   string (FIND "${OCCT_PACKAGE}" "/" _index)
   if (_index GREATER -1)
@@ -108,17 +92,19 @@ macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
 
   #message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}")
   foreach (QRC_FILE ${QRC_FILES})
-    if (EXISTS ${QRC_FILE})
-      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE} RCC_FILES)
+    set (QRC_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}")
+    if (EXISTS ${QRC_FILE_RELATIVE})
+      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES)
       list (APPEND ${RESOURCE_FILES} "${RCC_FILES}")
     endif()
   endforeach()
 
   #message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}")
   foreach (TS_FILE ${TS_FILES})
-    FIND_AND_WRAP_TS_FILE(${TS_FILE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
-    if (EXISTS ${TS_FILE})
-      list (APPEND ${RESOURCE_FILES} "${TS_FILE}")
+    set (TS_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${TS_FILE}")
+    FIND_AND_WRAP_TS_FILE(${TS_FILE_RELATIVE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
+    if (EXISTS ${TS_FILE_RELATIVE})
+      list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}")
       list (APPEND ${RESOURCE_FILES} "${QM_FILES}")
     endif()
   endforeach()

adm/cmake/rapidjson.cmake

@@ -1,13 +1,5 @@
 # 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()
@@ -90,5 +82,5 @@ else()
   set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
 endif()
 
-# hide all redundant variables
-mark_as_advanced(RapidJSON_DIR)
+# unset all redundant variables
+OCCT_CHECK_AND_UNSET(RapidJSON_DIR)

adm/cmake/tbb.cmake

@@ -1,18 +1,5 @@
 # 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)
@@ -71,12 +58,7 @@ if (WIN32)
 
     # Get installed configuration of tbb
     get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
-    # 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()
+    list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
 
     separate_arguments (CSF_TBB)
     foreach (LIB IN LISTS CSF_TBB)
@@ -209,12 +191,7 @@ else ()
 
   # Get installed configuration of tbb
   get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
-  # 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()
+  list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
 
   separate_arguments (CSF_TBB)
   foreach (LIB IN LISTS CSF_TBB)

adm/cmake/tcl.cmake

@@ -1,6 +1,6 @@
 # tcl
 
-if (NOT DEFINED INSTALL_TCL AND NOT BUILD_USE_VCPKG)
+if (NOT DEFINED INSTALL_TCL)
   set (INSTALL_TCL OFF CACHE BOOL "${INSTALL_TCL_DESCR}")
 endif()
 
@@ -14,11 +14,6 @@ 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)
-  set (3RDPARTY_TCL_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" CACHE FILEPATH "The directory containing tcl library" FORCE)
-endif()
 
 # tcl library file (with absolute path)
 if (NOT DEFINED 3RDPARTY_TCL_LIBRARY OR NOT 3RDPARTY_TCL_LIBRARY_DIR)
@@ -183,7 +178,7 @@ endif()
 
 if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
   list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TCL_LIBRARY_DIR}")
-elseif(NOT BUILD_USE_VCPKG)
+else()
   list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TCL_LIBRARY_DIR)
 endif()
 
@@ -274,12 +269,13 @@ if (TK_FOUND AND 3RDPARTY_TCL_DIR)
   endif()
 endif()
 
-# hide all redundant variables
-# TCL
-mark_as_advanced (TCL_LIBRARY)
-mark_as_advanced (TCL_INCLUDE_PATH)
-mark_as_advanced (TCL_TCLSH)
+# unset all redundant variables
+#TCL
+OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
+OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TCL_TCLSH)
 #TK
-mark_as_advanced (TK_LIBRARY)
-mark_as_advanced (TK_INCLUDE_PATH)
-mark_as_advanced (TK_WISH)
+OCCT_CHECK_AND_UNSET (TK_LIBRARY)
+OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TK_WISH)
+

adm/cmake/tk.cmake

@@ -18,12 +18,6 @@ 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)
@@ -196,8 +190,7 @@ if (BUILD_SHARED_LIBS)
   if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
     list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
   else()
-    set (USE_TK OFF)
-    message(STATUS "Warning: TK library is not found. TK will be disabled.")
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TK_LIBRARY_DIR)
   endif()
 
   if (WIN32)
@@ -274,15 +267,15 @@ if (BUILD_SHARED_LIBS)
   mark_as_advanced (3RDPARTY_TK_LIBRARY 3RDPARTY_TK_DLL)
 endif()
 
-# hide all redundant variables
-
-mark_as_advanced (TCL_LIBRARY)
-mark_as_advanced (TCL_INCLUDE_PATH)
-mark_as_advanced (TCL_TCLSH)
+# unset all redundant variables
+#TCL
+OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
+OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TCL_TCLSH)
 #TK
-mark_as_advanced (TK_LIBRARY)
-mark_as_advanced (TK_INCLUDE_PATH)
-mark_as_advanced (TK_WISH)
+OCCT_CHECK_AND_UNSET (TK_LIBRARY)
+OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TK_WISH)
 
 if (NOT BUILD_SHARED_LIBS)
   OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY)

adm/cmake/vardescr.cmake

@@ -1,8 +1,12 @@
 # variable description
 
-set (OCCT_PROJECT_NAME_DESCR
-"Project name used in install directory paths for Unix and vcpkg layouts.
-Allows customization of directory structure for different package names.")
+# 
+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
@@ -60,7 +64,7 @@ set (INSTALL_DIR_WITH_VERSION_DESCR
 
 set (INSTALL_DIR_LAYOUT_DESCR
 "Defines structure of OCCT files (binaries, resources, headers etc.) for the install directory.
-Three variants are predefined: for Windows (standard OCCT layout), for Unix operating systems (standard Linux layout), and for vcpkg (standard vcpkg layout without 'd' and 'i' suffixes).
+Two variants are predefined: for Windows (standard OCCT layout) and for Unix operating systems (standard Linux layout).
 If needed, layout can be customized with INSTALL_DIR_* variables.")
 
 set (INSTALL_DIR_BIN_DESCR 
@@ -117,6 +121,7 @@ endmacro()
 
 BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_DETools              "DETools")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")
@@ -140,6 +145,13 @@ set (BUILD_SAMPLES_QT_DESCR
 These samples show some possibilities of using OCCT and they can be executed
 with script samples.bat from the installation directory (INSTALL_DIR)")
 
+set (BUILD_Inspector_DESCR
+"Indicates whether OCCT inspector should be built together with OCCT.
+This inspector provides functionality to interactively inspect low-level content
+of the OCAF data model, OCCT viewer, etc. have been introduced in OCCT.
+It can be executed with script inspector.bat from the installation directory (INSTALL_DIR) or
+using 'tinspector' command in DRAW interpretator")
+
 set (BUILD_MODULE_UwpSample_DESCR
 "Indicates whether OCCT UWP sample should be built together with OCCT.")
 
@@ -203,30 +215,7 @@ set (USE_XLIB_DESCR "Indicates whether X11 is used or not")
 
 set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
 
-# Documentation variables
-set (BUILD_DOC_Overview_DESCR 
-     "Build OCCT overview documentation using Doxygen")
-     
-set (BUILD_DOC_RefMan_DESCR 
-     "Build OCCT reference manual documentation using Doxygen")
-     
-set (INSTALL_DOC_Overview_DESCR 
-     "Install OCCT overview documentation")
-     
-set (INSTALL_DOC_RefMan_DESCR 
-     "Install OCCT reference manual documentation")
-
 macro (BUILD_MODULE MODULE_NAME)
   set (ENABLE_MODULE TRUE)
   set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
-  OCCT_INCLUDE_CMAKE_FILE (src/${MODULE_NAME}/TOOLKITS)
-  set (${MODULE_NAME}_TOOLKITS ${OCCT_${MODULE_NAME}_LIST_OF_TOOLKITS})
-  foreach (TOOLKIT ${OCCT_${MODULE_NAME}_LIST_OF_TOOLKITS})
-    OCCT_INCLUDE_CMAKE_FILE (src/${MODULE_NAME}/${TOOLKIT}/PACKAGES)
-    OCCT_INCLUDE_CMAKE_FILE (src/${MODULE_NAME}/${TOOLKIT}/EXTERNLIB)
-    OCCT_INCLUDE_CMAKE_FILE (src/${MODULE_NAME}/${TOOLKIT}/FILES)
-    foreach (PACKAGE ${OCCT_${TOOLKIT}_LIST_OF_PACKAGES})
-      OCCT_INCLUDE_CMAKE_FILE (src/${MODULE_NAME}/${TOOLKIT}/${PACKAGE}/FILES)
-    endforeach()
-  endforeach()
 endmacro()