Update

.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/CLA.md

@@ -1,59 +0,0 @@
-# Contributor License Agreement - OPEN CASCADE TECHNOLOGY
-
-Thank You for Your interest in Open CASCADE Technology.
-
-In order to clarify the intellectual property rights and the license granted to OPEN CASCADE SAS with contributions from You, any person or entity, OPEN CASCADE SAS must have this Contributor License Agreement (hereinafter referred to as "CLA") signed by You, indicating Your acceptance and consent to the license terms below. This license is for Your protection as a contributor as well as for the protection of OPEN CASCADE SAS and its users; it does not change Your rights to use Your own contributions for any other purpose.
-
-This CLA applies to any contribution that You make to the product "Open CASCADE Technology" (hereinafter referred to as "OCCT", "the Product") developed by OPEN CASCADE SAS, including all contributions You made prior to signing this CLA and all of Your future contributions submitted to OPEN CASCADE SAS as long as You agree to this CLA, and sets out the intellectual property rights You grant to OPEN CASCADE SAS in the contributed materials. The term "us" shall also mean OPEN CASCADE SAS.
-
-The term "You" shall mean the person or entity identified below, representing the copyright owner or legal entity authorized by the copyright owner that is making this agreement with OPEN CASCADE SAS. For legal entities, the entity making a contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single contributor. For the purposes of this definition, "control" means (i) the power, either direct or indirect, to exert influence on the direction or management of such entity, whether by contract or otherwise, or (ii) the ownership of fifty percent (50%) or more of the outstanding shares, or (iii) the beneficial ownership of such entity.
-
-Read this CLA carefully before signing and keep a copy for Your records. This CLA, its terms and conditions, constitute a binding legal agreement.
-
-If You agree to be bound by the terms of this CLA, please complete and sign this CLA where indicated below, then scan and submit the scanned copy as a PDF file to OPEN CASCADE SAS via Your user account section on the Web portal. Alternatively, You may send the signed CLA to OPEN CASCADE SAS by facsimile or in hard copy to the attention of DANIEL BRUNIER-COULIN at OPEN CASCADE SAS headquarters using the contact information provided in the "Contact Us" section.
-
-1. The term "contribution" or "contributed materials" means any source code, object code, patch, tool, sample, graphic, specification, manual, documentation, any original work of authorship, including any modifications or additions to an existing work or any other material intentionally posted or submitted by You to us. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to OPEN CASCADE SAS or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, OPEN CASCADE SAS for the purpose of, but not limited to, discussing and improving a work or possible integration to future certified releases of OCCT, but excluding communication that is conspicuously marked or otherwise designated in writing by You or OPEN CASCADE SAS as "Not A Contribution" or "NAC".
-
-2. With respect to any worldwide copyrights, or copyright applications and registrations, in Your contribution:
-
-   a) You hereby assign to OPEN CASCADE SAS joint ownership, and to the extent that such assignment is or becomes invalid, ineffective or unenforceable, You hereby grant to OPEN CASCADE SAS a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free, unrestricted license to exercise all rights under the intellectual property law and rules in force or under the copyright if chosen by OPEN CASCADE SAS. This includes, at the option of OPEN CASCADE SAS, the right to sublicense these same rights to third parties through multiple levels of sub-licensees or other licensing arrangements;
-
-   b) You agree that OPEN CASCADE SAS can do all things in relation to Your contribution as if OPEN CASCADE SAS were its sole owner, and if OPEN CASCADE SAS makes a derivative work of Your contribution, OPEN CASCADE SAS will be the sole owner of that derivative work;
-
-   c) You agree that You will not assert any moral rights in Your contribution against OPEN CASCADE SAS, our licensees or transferees;
-
-   d) You agree that OPEN CASCADE SAS may register a copyright or any other intellectual property law in force in Your contribution and exercise all ownership rights associated with it; and
-
-   e) You agree that OPEN CASCADE SAS has no duty to consult with, obtain the consent of, pay or render an accounting to You or any third parties for any use or distribution of Your contribution.
-
-3. With respect to any patents You own, or that You can license without payment to any third party, You hereby grant to OPEN CASCADE SAS a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free, unrestricted license to:
-
-   a) make, have made, use, sell, offer to sell, import, and otherwise transfer Your contribution in whole or in part, alone or in combination with or included in any product, work or materials arising out of the Product which Your contribution was submitted for;
-
-   b) sublicense these same rights to third parties through multiple levels of sub-licensees or other licensing arrangements; and
-
-   c) reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such derivative works.
-
-4. Except as set out above, You keep all right, title, and interest in Your contribution. The rights that You grant to OPEN CASCADE SAS under these terms are effective on the date You first submitted a contribution to OPEN CASCADE SAS, even if Your submission took place before the date You sign these terms. Any contribution OPEN CASCADE SAS makes available under any license will also be made available under the Open Cascade Technology Public License (OCCTPL) or a suitable FSF (Free Software Foundation) or OSI (Open Source Initiative) approved license, if adopted by OPEN CASCADE SAS.
-
-5. You covenant, represent and warrant that:
-
-   a) each contribution that You submit is and shall be an original work of authorship and that You can legally grant the rights set out in this CLA; and
-
-   b) each contribution will not violate any third party's copyrights, trademarks, patents, or other intellectual property rights; and
-
-   c) if any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your contribution, or the work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this CLA for that contribution or work shall terminate as of the date such litigation is filed; and
-
-   d) You have received permission to make contributions on behalf of the employer, that Your employer has waived such rights for Your contributions to OPEN CASCADE SAS, or that Your employer (that has rights to intellectual property that You create that includes Your contributions) has executed a separate corporate CLA with OPEN CASCADE SAS.
-
-6. Should You wish to submit work that is not Your original creation, You may submit it to OPEN CASCADE SAS separately from any contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements), and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
-
-7. You agree to notify OPEN CASCADE SAS if You become aware of any circumstance which would make any of the foregoing representations inaccurate in any respect. OPEN CASCADE SAS may publicly disclose Your contribution to the Product and the fact that You have signed this CLA.
-
-8. You are not expected to provide support for Your contributions, except to the extent You desire to provide support.
-
-9. This CLA is governed by the laws of France or an applicable law at the sole written choice of OPEN CASCADE SAS.
-
-10. You may stop being bound by the terms of this CLA at any time, for any reason, by asking OPEN CASCADE through the Contact Us form. Even after its termination, this CLA still applies to all contributions You made prior to terminating the CLA. On the other hand, if You want to contribute again, You'll need to sign a new CLA.
-
-[Contributor_License_Agreement.pdf](https://dev.opencascade.org/sites/default/files/Contributor_License_Agreement.pdf)

.github/CLA_SIGNING.md

@@ -1,39 +0,0 @@
-# Signing the Contributor License Agreement
-
-## In order to contribute code to OCCT, you (or the legal entity you represent) must sign the Contributor License Agreement (CLA).
-
-### What is the Contributor License Agreement and why is it necessary to sign it?
-The Contributor License Agreement is needed to clarify the terms of usage of contributions by OPEN CASCADE SAS and the entire open source community.
-
-The Contributor License Agreement clarifies the intellectual property rights applicable to contributions. It confirms that the contributor retains ownership of his contributions (the OPEN CASCADE company does not require exclusive copyright transfer for these contributions) and gives all rights to OPEN CASCADE to use the contribution. In turn, OPEN CASCADE guarantees the open source availability of all integrated contributions.
-
-### How to sign the Contributor License Agreement
-Accepting and signing the Contributor License Agreement is a prerequisite for contributing code. To sign the CLA, please register yourself first, and then follow the steps below:
-1. Select the "Get Involved" menu
-2. Download the Contribution License Agreement pdf file and print it
-3. Read the agreement and sign it
-4. Scan the signed CLA to a pdf file
-5. If not yet done, log on to this website
-6. In the CLA sending form, press the "Browse" button
-7. Select your signed CLA file
-8. Press "Send"
-
-We will need some time to approve the CLA that you have submitted. You will be notified by e-mail when your CLA is approved and you are assigned the Contributor role.
-
-### Q&A on the Contribution Agreement
-
-**I want to contribute code that I developed as part of my job. Can I contribute this code?**
-
-Yes, but as (under applicable legislation) your employer typically will own all intellectual property that you create as part of your employment, it is important that your employer has consented to your participation and contributions in the OCCT Project. That provides clarity to all parties involved.
-
-**Can we sign a CLA to enable contributions from several employees in our company?**
-
-Yes, if your company has several employees ready to contribute, a person representing your company can sign the CLA whereby your employer can specify and manage who is able to contribute from your company.
-
-**I want to notify the OCCT Project of a bug I found. Can I report this bug?**
-
-Yes, you simply need to register (you then become a Member) for entering a bug. The bug can be entered using our bug tracker from the Get Involved page. But please note that as a Member of this project, you have accepted the Terms and Conditions of this website, so the materials you provide must conform to these Terms.
-
-**Can I terminate my Contributor License Agreement?**
-
-Yes, you may terminate your Contributor License Agreement by sending a written notice through the contact form of this portal. The termination of your CLA will become effective not later than 5 days from the notice date. Please note, however, that all contributions you might have made to the OCCT Project before your CLA termination remain covered by that CLA.

.github/CONTRIBUTING.md

@@ -1,41 +0,0 @@
-# Contributing to OCCT
-
-## Contribute Code
-
-In order to contribute code to OCCT, you must register on this [portal](https://dev.opencascade.org/) and sign the Contributor License Agreement (CLA).
-
-- [Introduction: What is CLA and Why It Is Needed?](CLA_SIGNING.md)
-- [Contribution License Agreement](CLA.md)
-- [CLA Submission Form](https://dev.opencascade.org/get_involed/cla_submission_form)
-
-### Steps to Submit Your Contribution
-1. **Clone OCCT Git Repository**: See [Guide to installing and using Git for OCCT development](https://dev.opencascade.org/doc/overview/html/occt_contribution__git_guide.html) if you are not familiar with Git.
-2. **Develop Your Change**: Ensure it complies with [OCCT Coding Rules](https://dev.opencascade.org/doc/overview/html/occt_contribution__coding_rules.html).
-3. **Build and Verify**: Build the modified version of OCCT and verify it works as expected. Consider creating a test case.
-4. **Register an Issue**: Register an issue in the [Mantis bug tracker](https://tracker.dev.opencascade.org/login_select_proj_page.php?ref=bug_report_page.php) or [GitHub issues](https://github.com/Open-Cascade-SAS/OCCT/issues) describing your change.
-5. **Push Your Change**: Push your change to the Git repository in a branch with a name starting with "CR" followed by the issue ID, then switch the issue to Resolved.
-
-The contribution then passes code review and testing; if everything is OK, it will be integrated into the master branch in about one week.
-
-See [Contribution Workflow](https://dev.opencascade.org/doc/overview/html/occt_contribution__contribution_workflow.html) for other possibilities and details on how contributions are processed.
-
-For more details on integration into GitHub, see the [GitHub Discussions Guide](https://github.com/Open-Cascade-SAS/OCCT/discussions/36).
-
-## Contribute Ideas
-
-Every big thing starts with an idea. We appreciate your vision on how to enhance Open CASCADE technology. Share your thoughts on the [OCCT product development forum](https://dev.opencascade.org/forums) or submit your meaningful ideas and bug reports via [Mantis tracker](https://tracker.dev.opencascade.org) or [GitHub issues](https://github.com/Open-Cascade-SAS/OCCT/issues).
-
-- **Forum**: [OCCT product development forum](https://dev.opencascade.org/forums)
-- **Reporting Issues**: [Mantis tracker](https://tracker.dev.opencascade.org) or [GitHub issues](https://github.com/Open-Cascade-SAS/OCCT/issues)
-
-## Contribute Knowledge
-
-Know a lot about OCCT? You can help educate other OCCT users by writing OCCT-related articles or blog posts, creating samples, examples, or tutorials, and even by writing a book about OCCT! If you would like us to share your content via official OCCT resources, please [contact us](https://dev.opencascade.org/webform/contact_us).
-
-## Contribute Documentation and Tutorials
-
-Do you have an idea on how to make OCCT Documentation easier for new users or even more exhaustive for professionals? Or want to help with proofreading and technical writing? Translating OCCT Documentation and materials into your native language is also very much appreciated. You are always welcome to submit your documentation improvement suggestions via [Mantis tracker](https://tracker.dev.opencascade.org) or [GitHub issues](https://github.com/Open-Cascade-SAS/OCCT/issues)..
-
-## Contribute to the Community
-
-At any community interaction points, we value your support in starting forum topics or replying to other users’ posts, joining Open CASCADE social networks, participating in GitHub or Stack Overflow projects, and just spreading the word about OCCT! Welcome to our community!

.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/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/config.yml

@@ -1,14 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Collaborative development portal
-    url: https://dev.opencascade.org/forums
-    about: You can also use the collaborative development portal to ask questions and discuss the problem you are seeing
-  - name: GitHub discussions
-    url: https://github.com/Open-Cascade-SAS/OCCT/discussions
-    about: You can also use GitHub discussions to ask questions and discuss the problem you are seeing
-  - name: Mantis bug tracker
-    url: https://tracker.dev.opencascade.org/
-    about: You can also use the Mantis bug tracker to report bugs and issues
-  - name: Contact US form
-    url: https://dev.opencascade.org/webform/contact_us
-    about: You can also use the Contact US form to ask questions and discuss the problem you are seeing

.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/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,24 +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"
-]
-
-set exclude_str [join $exclude_list ,]
-testgrid -exclude {*}$exclude_str -outdir results/windows-x64

.github/actions/testgrid/testwindowsclang.tcl

@@ -1,25 +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"
-]
-
-set exclude_str [join $exclude_list ,]
-testgrid -exclude {*}$exclude_str -outdir results/windows-clang-x64

.github/workflows/build-docs.yml

@@ -1,59 +0,0 @@
-# This workflow builds the OCCT reference manual and overview documentations.
-# 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: windows-2022
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.2.1
-
-    - name: Install dependencies
-      run: |
-        choco install -y graphviz
-        choco install -y doxygen.install
-
-    - name: Build refman documentation
-      run: |
-        set PATH=%PATH%;C:\Program Files\doxygen\bin;C:\Program Files\Graphviz\bin;C:\Program Files\doxygen
-        cd adm
-        bash gendoc -refman
-      shell: cmd
-
-    - name: Upload refman documentation
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: refman-doc
-        path: doc/refman
-        retention-days: 90
-
-    - name: Upload generation log
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: doxygen.log
-        path: doc/html_doxygen_err.log
-        retention-days: 90
-
-    - name: Build documentation Overview
-      run: |
-        set PATH=%PATH%;C:\Program Files\doxygen\bin;C:\Program Files\Graphviz\bin;C:\Program Files\doxygen
-        cd adm
-        bash gendoc -overview
-      shell: cmd
-
-    - name: Upload overview documentation
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: overview-doc
-        path: doc/overview
-        retention-days: 90

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

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

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

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

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

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

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

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

.github/workflows/clang-format-check.yml

@@ -1,84 +0,0 @@
-# This workflow checks the code formatting of changed files in a pull request using clang-format.
-# It is triggered on pull requests to the master branch.
-# The workflow verifies that the clang-format version matches 18.1.8,
-# checks formatting of modified files, and if formatting issues are found,
-# creates a patch file that can be applied to fix the formatting.
-
-name: Clang-Format Check
-
-on:
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  format-check:
-    name: Check code formatting
-    runs-on: windows-2022
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.1.7
-      with:
-        fetch-depth: 0
-
-    - name: Check clang-format version
-      run: |
-        $version = clang-format --version
-        Write-Output "Detected clang-format version: $version"
-        $version | Select-String "18.1.8" >$null
-        if ($LASTEXITCODE -ne 0) {
-          echo "::error::Wrong clang-format version. Expected 18.1.8"
-          Write-Output "Error: Version mismatch - expected 18.1.8"
-          exit 1
-        }
-      shell: pwsh
-
-    - name: Get changed files
-      id: changed-files
-      run: |
-        $changedFiles = git diff --name-only origin/${{ github.base_ref }} HEAD |
-          Where-Object { $_ -match '^(src|tools)/' -and $_ -match '\.(cpp|hxx|cxx|lxx|h|pxx|hpp)$' }
-        $changedFiles | Set-Content "changed_files.txt"
-        if ($changedFiles.Count -gt 0) {
-          echo "has_files=true" >> $env:GITHUB_OUTPUT
-        }
-      shell: pwsh
-
-    - name: Check formatting
-      id: check
-      if: steps.changed-files.outputs.has_files == 'true'
-      run: |
-        $files = Get-Content "changed_files.txt"
-        $files | ForEach-Object -ThrottleLimit 8 -Parallel {
-          clang-format -i -style=file $_
-        }
-      shell: pwsh
-
-    - name: Check git status
-      id: git-check
-      if: steps.changed-files.outputs.has_files == 'true'
-      run: |
-        git diff > format.patch
-        if ((Get-Item format.patch).length -gt 0) {
-          echo "has_changes=true" >> $env:GITHUB_OUTPUT
-        }
-      shell: pwsh
-
-    - name: Upload patch
-      if: steps.git-check.outputs.has_changes == 'true'
-      uses: actions/upload-artifact@v4
-      with:
-        name: format-patch
-        path: format.patch
-
-    - name: Fail with instructions
-      if: steps.git-check.outputs.has_changes == 'true'
-      run: |
-        echo "::error::Files need formatting. To fix: 1. Download format.patch 2. "git apply format.patch" 3. Commit and push"
-        exit 1
-      shell: pwsh

.github/workflows/code-analysis.yml

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

.gitignore

@@ -1,8 +1,6 @@
 
 # standard directories for derived files in CASROOT
 /.adm
-/.cache
-/.vscode
 /lin
 /mac
 /wnt

.tgitconfig

@@ -1,3 +1,3 @@
-[bugtraq]
+[bugtraq]
-	url = https://tracker.dev.opencascade.org/view.php?id=%BUGID%
+	url = https://tracker.dev.opencascade.org/view.php?id=%BUGID%
-	logregex = "(\\s)(00|#)\\d+(?!\\w)\n(\\d+)"
+	logregex = "(\\s)(00|#)\\d+(?!\\w)\n(\\d+)"

README.md

@@ -1,64 +0,0 @@
-# Open CASCADE Technology
-
-Open CASCADE Technology (OCCT) is a software development platform providing services for 3D surface and solid modeling, CAD data exchange, and visualization. Most of OCCT functionality is available in the form of C++ libraries. OCCT is ideal for developing software dealing with 3D modeling (CAD), manufacturing/measuring (CAM), or numerical simulation (CAE).
-
-## License
-
-Open CASCADE Technology is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation, with a special exception defined in the file `OCCT_LGPL_EXCEPTION.txt`. Consult the file `LICENSE_LGPL_21.txt` included in the OCCT distribution for the complete text of the license.
-
-Alternatively, Open CASCADE Technology may be used under the terms of the Open CASCADE commercial license or a contractual agreement.
-
-**Note:** Open CASCADE Technology is provided on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND. The entire risk related to any use of the OCCT code and materials is on you. See the license text for a formal disclaimer.
-
-## Packaging
-
-You can receive certified versions of OCCT code in different packages:
-
-- **Snapshot of Git repository:** Contains C++ header and source files of OCCT, documentation sources, build scripts, and CMake project files.
-- **Complete source archive:** Contains all sources of OCCT, generated HTML and PDF documentation, and ready-to-use projects for building on all officially supported platforms.
-- **Binary package (platform-specific):** In addition to the complete source archive, it includes binaries of OCCT and third-party libraries built on one platform. This package allows using OCCT immediately after installation.
-
-Certified versions of OCCT can be downloaded from:
-- [Open CASCADE Releases](https://dev.opencascade.org/release)
-- [GitHub Releases](https://github.com/Open-Cascade-SAS/OCCT/releases)
-
-You can also find OCCT pre-installed on your system or install it from packages provided by a third party. Note that packaging and functionality of such versions can be different from certified releases. Please consult the documentation accompanying your version for details.
-
-## Documentation
-
-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)
-
-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).
-
-See [dox/build/build_documentation/building_documentation.md](dox/build/build_documentation/building_documentation.md) or [Building Documentation](https://dev.opencascade.org/doc/occt-7.8.0/overview/html/build_upgrade__building_documentation.html) for details.
-
-## Building
-
-In most cases, you need to rebuild OCCT on your platform (OS, compiler) before using it in your project to ensure binary compatibility.
-
-Consult the file [dox/build/build_occt/building_occt.md](dox/build/build_occt/building_occt.md) or [Building OCCT](https://dev.opencascade.org/doc/overview/html/build_upgrade__building_occt.html) or [Building OCCT Wiki](https://github.com/Open-Cascade-SAS/OCCT/wiki/build_upgrade) for instructions on building OCCT from sources on supported platforms.
-
-## Version
-
-The current version of OCCT can be found in the file [`src/Standard/Standard_Version.hxx`](src/Standard/Standard_Version.hxx).
-
-## Development
-
-### Bug Tracker
-- [GitHub Issues](https://github.com/Open-Cascade-SAS/OCCT/issues)
-- [OCCT Tracker](https://tracker.dev.opencascade.org/)
-
-For information regarding OCCT code development, please consult the official OCCT Collaborative Development Portal:
-- [OCCT Development Portal](http://dev.opencascade.org)
-
-### Forum and Discussions
-- [OCCT Forums](https://dev.opencascade.org/forums)
-- [GitHub Discussions](https://github.com/Open-Cascade-SAS/OCCT/discussions)

README.txt

@@ -0,0 +1,89 @@
+Open CASCADE Technology
+=======================
+
+This directory contains sources of Open CASCADE Technology (OCCT), a software
+development platform providing services for 3D surface and solid modeling, CAD 
+data exchange, and visualization. Most of OCCT functionality is available in 
+the form of C++ libraries. OCCT can be best applied in development of software 
+dealing with 3D modeling (CAD), manufacturing / measuring (CAM) or numerical 
+simulation (CAE).
+
+License
+-------
+
+Open CASCADE Technology is free software; you can redistribute it and / or 
+modify it under the terms of the GNU Lesser General Public version 2.1 as 
+published by the Free Software Foundation, with special exception defined in 
+the file OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included
+in OCCT distribution for complete text of the license.
+
+Alternatively, Open CASCADE Technology may be used under the terms of Open 
+CASCADE commercial license or contractual agreement.
+
+Note that Open CASCADE Technology is provided on an "AS IS" basis, WITHOUT 
+WARRANTY OF ANY KIND. The entire risk related to any use of the OCCT code and 
+materials is on you. See the license text for formal disclaimer.
+
+Packaging
+---------
+
+You can receive certified version of OCCT code in different packages.
+
+- Snapshot of Git repository: contains C++ header and source files of OCCT,
+  documentation sources, build scripts, and CMake project files.
+
+- Complete source archive: contains all sources of OCCT, generated HTML and PDF
+  documentation, and ready-to-use projects for building on all officially 
+  supported platforms.
+
+- Binary package (platform-specific): in addition to complete source archive, 
+  it includes binaries of OCCT and third-party libraries built on one platform. 
+  This package allows using OCCT immediately after installation.
+
+Certified versions of OCCT can be downloaded from http://www.opencascade.com
+
+You can also find OCCT pre-installed on your system, or install it from 
+packages provided by a third party. Note that packaging and functionality
+of such versions can be different from certified releases. Please consult 
+documentation accompanying your version for details.
+
+Documentation
+-------------
+
+Open 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 environment variable PATH).
+  Use batch file *gendoc.bat* on Windows or Bash script *gendoc* on Linux
+  or OS X to (re)generate documentation.
+
+- Read documentation in source plain text (MarkDown) format found in 
+  subfolder *dox*
+
+See *dox/dev_guides/documentation/documentation.md* for details.
+
+Building
+--------
+
+In most cases you need to rebuild OCCT on your platform (OS, compiler) before
+using it in your project, to ensure binary compatibility.
+
+Consult the file *dox/dev_guides/building/building.md* for instructions on
+building OCCT from sources on supported platforms.
+
+Version
+-------
+
+The current version of OCCT can be consulted in the file
+*src/Standard/Standard_Version.hxx*
+
+Development
+-----------
+
+For information regarding OCCT code development please consult the official 
+OCCT Collaborative Development Portal:
+http://dev.opencascade.org

adm/.gitignore

@@ -0,0 +1 @@
+/build-*

adm/CMPLRS

@@ -0,0 +1,18 @@
+wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
+lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
+
+wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
+wnt cmplrs_cxx (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
+
+wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50
+
+lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+
+lin cmplrs_c f -D_GNU_SOURCE=1 -fexceptions
+lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions
+

adm/MODULES

@@ -1,8 +1,7 @@
-FoundationClasses TKernel TKMath
+FoundationClasses TKernel TKMath
-ModelingData TKG2d TKG3d TKGeomBase TKBRep
+ModelingData TKG2d TKG3d TKGeomBase TKBRep
-ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
+ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
-Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
+Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
-ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
+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
+DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
-DETools TKExpress ExpToCasExe
+Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
-Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE TKXSDRAWDE TKXSDRAWGLTF TKXSDRAWIGES TKXSDRAWOBJ TKXSDRAWPLY TKXSDRAWSTEP TKXSDRAWSTL TKXSDRAWVRML

adm/RESOURCES

@@ -1,12 +1,12 @@
-DrawResources
+DrawResources
-StdResource
+StdResource
-SHMessage
+SHMessage
-Textures
+Textures
-Shaders
+Shaders
-XRResources
+XRResources
-XSMessage
+XSMessage
-XSTEPResource
+XSTEPResource
-XmlOcafResource
+XmlOcafResource
-UnitsAPI/Units.dat
+UnitsAPI/Units.dat
-TObj/TObj.msg
+TObj/TObj.msg
-BOPAlgo/BOPAlgo.msg
+BOPAlgo/BOPAlgo.msg

adm/SAMPLES_RESOURCES

@@ -1,3 +1,3 @@
-qt/Common/res/
+qt/Common/res/
-qt/Tutorial/res/
+qt/Tutorial/res/
 qt/OCCTOverview/res/

adm/TOOLS

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

adm/UDLIST

@@ -32,7 +32,6 @@ n UnitsAPI
 n gp
 n math
 r OS
-n FlexLexer
 t TKMath
 t TKernel
 n Adaptor2d
@@ -377,13 +376,18 @@ r SHMessage
 r XSMessage
 r XSTEPResource
 t TKBinXCAF
-t TKDESTL
+t TKIGES
-t TKDEVRML
+t TKSTEP
+t TKSTEP209
+t TKSTEPAttr
+t TKSTEPBase
+t TKSTL
+t TKVRML
 t TKXCAF
-t TKDE
+t TKXDE
-t TKDECascade
+t TKXDECascade
-t TKDEIGES
+t TKXDEIGES
-t TKDESTEP
+t TKXDESTEP
 t TKXSBase
 t TKXmlXCAF
 n BOPTest
@@ -415,12 +419,7 @@ n XDEDRAW
 n XSDRAW
 n XSDRAWIGES
 n XSDRAWSTEP
-n XSDRAWSTL
+n XSDRAWSTLVRML
-n XSDRAWVRML
-n XSDRAWDE
-n XSDRAWGLTF
-n XSDRAWOBJ
-n XSDRAWPLY
 r DrawResources
 t TKDCAF
 t TKDraw
@@ -432,14 +431,6 @@ 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
@@ -465,9 +456,6 @@ t TKVCAF
 n XCAFView
 n XCAFNoteObjects
 t TKRWMesh
-t TKDEGLTF
-t TKDEOBJ
-t TKDEPLY
 n RWGltf
 n RWMesh
 n RWObj

adm/cmake/3rdparty_macro.cmake

@@ -1,366 +1,365 @@
-##
+##
-
+
-if(3RDPARTY_MACRO_ALREADY_INCLUDED)
+if(3RDPARTY_MACRO_ALREADY_INCLUDED)
-  return()
+  return()
-endif()
+endif()
-set(3RDPARTY_MACRO_ALREADY_INCLUDED 1)
+set(3RDPARTY_MACRO_ALREADY_INCLUDED 1)
-
+
-
+
-macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME_DEBUG_SUFFIX)
+macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME_DEBUG_SUFFIX)
-
+
-  if (NOT DEFINED INSTALL_${PRODUCT_NAME} AND BUILD_SHARED_LIBS)
+  if (NOT DEFINED INSTALL_${PRODUCT_NAME} AND BUILD_SHARED_LIBS)
-    set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "${INSTALL_${PRODUCT_NAME}_DESCR}")
+    set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "${INSTALL_${PRODUCT_NAME}_DESCR}")
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
+  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}")
+    set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}")
-  endif()
+  endif()
-
+
-  # include occt macros. compiler_bitness, os_wiht_bit, compiler
+  # include occt macros. compiler_bitness, os_wiht_bit, compiler
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-  # specify product folder in connection with 3RDPARTY_DIR
+  # specify product folder in connectin with 3RDPARTY_DIR
-  if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+  if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-    #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_${PRODUCT_NAME}_DIR PATH "The directory containing ${PRODUCT_NAME}")
+    #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_${PRODUCT_NAME}_DIR PATH "The directory containing ${PRODUCT_NAME}")
-
+
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+    if (NOT 3RDPARTY_${PRODUCT_NAME}_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" ${PRODUCT_NAME} ${PRODUCT_NAME}_DIR_NAME)
+      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" ${PRODUCT_NAME} ${PRODUCT_NAME}_DIR_NAME)
-      if (${PRODUCT_NAME}_DIR_NAME)
+      if (${PRODUCT_NAME}_DIR_NAME)
-        set (3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
+        set (3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-  else()
+  else()
-    #set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
+    #set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
+  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR           "" CACHE PATH "the path of ${HEADER_NAME}")
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR           "" CACHE PATH "the path of ${HEADER_NAME}")
-  endif()
+  endif()
-
+
-  separate_arguments (${LIBRARY_CSF_NAME})
+  separate_arguments (${LIBRARY_CSF_NAME})
-  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-    string (REPLACE "." "" LIBRARY_NAME "${LIBRARY_NAME}")
+    string (REPLACE "." "" LIBRARY_NAME "${LIBRARY_NAME}")
-    if (BUILD_SHARED_LIBS)
+    if (BUILD_SHARED_LIBS)
-      if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}")
+      if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}")
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}               "" CACHE FILEPATH "${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}               "" CACHE FILEPATH "${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-      endif()
+      endif()
-
+
-      if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME})
+      if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME})
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
-      endif()
+      endif()
-
+
-      if (WIN32)
+      if (WIN32)
-        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}}")
+        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)
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-        endif()
+        endif()
-      endif()
+      endif()
-
+
-      if (WIN32)
+      if (WIN32)
-        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME})
+        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}\"")
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}             "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
-        endif()
+        endif()
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
+    # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
-    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR PATH "the path to ${PRODUCT_NAME}")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR PATH "the path to ${PRODUCT_NAME}")
-      if (BUILD_SHARED_LIBS)
+      if (BUILD_SHARED_LIBS)
-        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
-
+
-        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}}")
+        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}}")
-          get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}}" PATH)
+          get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}}" PATH)
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-        else()
+        else()
-          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
-        endif()
+        endif()
-
+
-        if (WIN32)
+        if (WIN32)
-          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} FILEPATH "the path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
+          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} FILEPATH "the path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
-
+
-          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}}")
+          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}}")
-            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}}" PATH)
+            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}}" PATH)
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-          else()
+          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}\"")
+            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()
+          endif()
-        endif()
+        endif()
-      endif()
+      endif()
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-  # header
+  # header
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-
+
-    # set 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR
+    # set 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to ${HEADER_NAME}" FORCE)
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to ${HEADER_NAME}" FORCE)
-
+
-    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
+      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
-                                                      PATHS ${3RDPARTY_${PRODUCT_NAME}_DIR}
+                                                      PATHS ${3RDPARTY_${PRODUCT_NAME}_DIR}
-                                                      PATH_SUFFIXES include inc headers
+                                                      PATH_SUFFIXES include inc headers
-                                                      CMAKE_FIND_ROOT_PATH_BOTH
+                                                      CMAKE_FIND_ROOT_PATH_BOTH
-                                                      NO_DEFAULT_PATH)
+                                                      NO_DEFAULT_PATH)
-    else()
+    else()
-      string(TOLOWER ${PRODUCT_NAME} LOW_CASE_PRODUCT_NAME)
+      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
-      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
+                                                      PATH_SUFFIXES include inc headers
-                                                      PATH_SUFFIXES include inc headers ${LOW_CASE_PRODUCT_NAME}
+                                                      CMAKE_FIND_ROOT_PATH_BOTH)
-                                                      CMAKE_FIND_ROOT_PATH_BOTH)
+    endif()
-    endif()
+  endif()
-  endif()
+
-
+  if (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-  if (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+  else()
-  else()
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
+
-
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The path to ${HEADER_NAME}" FORCE)
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The path to ${HEADER_NAME}" FORCE)
+  endif()
-  endif()
+
-
+  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+    string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-    string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+#    if (BUILD_SHARED_LIBS)
-#    if (BUILD_SHARED_LIBS)
+      # library
-      # library
+      if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
-      if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
+        set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
-        set (CMAKE_FIND_LIBRARY_SUFFIXES .dll.a .lib .so .dylib .a)
+
-
+        set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
-        set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
+        if (WIN32)
-        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} win${COMPILER_BITNESS}/${COMPILER}/lib)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/win${COMPILER_BITNESS})
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/win${COMPILER_BITNESS})
+        endif()
-        endif()
+        if (ANDROID)
-        if (ANDROID)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
+        endif()
-        endif()
+        if(UNIX AND NOT APPLE AND NOT ANDROID)
-        if(UNIX AND NOT APPLE AND NOT ANDROID)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/linux${COMPILER_BITNESS})
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/linux${COMPILER_BITNESS})
+        endif()
-        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 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)
-        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}}"))
-        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}
-          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
+                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                                                CMAKE_FIND_ROOT_PATH_BOTH
-                                                                                CMAKE_FIND_ROOT_PATH_BOTH
+                                                                                NO_DEFAULT_PATH)
-                                                                                NO_DEFAULT_PATH)
+          if ("${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
-          if ("${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
+            # find directory recursive
-            # find directory recursive
+            FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} "${${PRODUCT_NAME}_PATH_SUFFIXES}" SUBDIR_NAME)
-            FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} "${${PRODUCT_NAME}_PATH_SUFFIXES}" SUBDIR_NAME)
+            if (NOT "${SUBDIR_NAME}" STREQUAL "")
-            if (NOT "${SUBDIR_NAME}" STREQUAL "")
+              find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
-              find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
+                                                           PATHS "${SUBDIR_NAME}"
-                                                           PATHS "${SUBDIR_NAME}"
+                                                           PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                           PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                           CMAKE_FIND_ROOT_PATH_BOTH
-                                                           CMAKE_FIND_ROOT_PATH_BOTH
+                                                           NO_DEFAULT_PATH)
-                                                           NO_DEFAULT_PATH)
+            endif()
-            endif()
+          endif()
-          endif()
+        else()
-        else()
+          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
-          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
+                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                                                CMAKE_FIND_ROOT_PATH_BOTH)
-                                                                                CMAKE_FIND_ROOT_PATH_BOTH)
+        endif()
-        endif()
+
-
+        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
-        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)
-          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)
-          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()
-        else()
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        endif()
-        endif()
+      endif()
-      endif()
+
-
+      if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
-      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}}")
-        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
+      else()
-      else()
+        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX})
-        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)
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+      endif()
-      endif()
+
-
+      # shared library
-      # shared library
+      if (WIN32)
-      if (WIN32)
+        if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
-        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 (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 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)
-          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}}"))
-          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}
-            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
+                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                               PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin bin/win${COMPILER_BITNESS}
-                                                                               PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin bin/win${COMPILER_BITNESS}
+                                                                               NO_DEFAULT_PATH)
-                                                                               NO_DEFAULT_PATH)
+            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
-            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
+              # find directory recursive
-              # find directory recursive
+              FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} bin SUBDIR_NAME)
-              FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} bin SUBDIR_NAME)
+              if (NOT "${SUBDIR_NAME}" STREQUAL "")
-              if (NOT "${SUBDIR_NAME}" STREQUAL "")
+                find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
-                find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
+                                                             PATHS "${SUBDIR_NAME}"
-                                                             PATHS "${SUBDIR_NAME}"
+                                                             PATH_SUFFIXES bin
-                                                             PATH_SUFFIXES bin
+                                                             NO_DEFAULT_PATH)
-                                                             NO_DEFAULT_PATH)
+              endif()
-              endif()
+            endif()
-            endif()
+          else()
-          else()
+            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME} PATH_SUFFIXES bin)
-            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME} PATH_SUFFIXES bin)
+          endif()
-          endif()
+
-
+          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
-          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)
-            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)
-            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()
-          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_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)
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+          endif()
-          endif()
+        endif()
-        endif()
+
-
+        if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
-        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}}")
-          list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
+        else()
-        else()
+          list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
-          list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
+        endif()
-        endif()
+      endif()
-      endif()
+
-
+      if (WIN32)
-      if (WIN32)
+        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "")
-        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "")
+      else()
-      else()
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "")
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "")
+      endif()
-      endif()
+
-
+      foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-      foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+        string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-        string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+        if (WIN32)
-        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}_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}}")
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
+        else()
-        else()
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS}")
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS}")
+        endif()
-        endif()
+      endforeach()
-      endforeach()
+
-
+      set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "")
-      set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "")
+
-
+      if (INSTALL_${PRODUCT_NAME})
-      if (INSTALL_${PRODUCT_NAME})
+        OCCT_MAKE_OS_WITH_BITNESS()
-        OCCT_MAKE_OS_WITH_BITNESS()
+        OCCT_MAKE_COMPILER_SHORT_NAME()
-        OCCT_MAKE_COMPILER_SHORT_NAME()
+        set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
-        set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
+
-
+        if (WIN32)
-        if (WIN32)
+          if (SINGLE_GENERATOR)
-          if (SINGLE_GENERATOR)
+            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" DESTINATION "${INSTALL_DIR_BIN}")
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" DESTINATION "${INSTALL_DIR_BIN}")
+          else()
-          else()
+            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
+                     CONFIGURATIONS Release
-                     CONFIGURATIONS Release
+                     DESTINATION "${INSTALL_DIR_BIN}")
-                     DESTINATION "${INSTALL_DIR_BIN}")
+            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
+                     CONFIGURATIONS RelWithDebInfo
-                     CONFIGURATIONS RelWithDebInfo
+                     DESTINATION "${INSTALL_DIR_BIN}i")
-                     DESTINATION "${INSTALL_DIR_BIN}i")
+            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
+                     CONFIGURATIONS Debug
-                     CONFIGURATIONS Debug
+                     DESTINATION "${INSTALL_DIR_BIN}d")
-                     DESTINATION "${INSTALL_DIR_BIN}d")
+          endif()
-          endif()
+        else()
-        else()
+          get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} REALPATH)
-          get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} REALPATH)
+
-
+          if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
-          if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
+            get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
-            get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
+
-
+            if (SINGLE_GENERATOR)
-            if (SINGLE_GENERATOR)
+              install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
-              install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
+            else()
-            else()
+              install (FILES "${ABS_PATH}"
-              install (FILES "${ABS_PATH}"
+                       CONFIGURATIONS Release
-                       CONFIGURATIONS Release
+                       DESTINATION "${INSTALL_DIR_LIB}"
-                       DESTINATION "${INSTALL_DIR_LIB}"
+                       RENAME ${FREEIMLIB}.3)
-                       RENAME ${FREEIMLIB}.3)
+              install (FILES "${ABS_PATH}"
-              install (FILES "${ABS_PATH}"
+                       CONFIGURATIONS RelWithDebInfo
-                       CONFIGURATIONS RelWithDebInfo
+                       DESTINATION "${INSTALL_DIR_LIB}i"
-                       DESTINATION "${INSTALL_DIR_LIB}i"
+                       RENAME ${FREEIMLIB}.3)
-                       RENAME ${FREEIMLIB}.3)
+              install (FILES "${ABS_PATH}"
-              install (FILES "${ABS_PATH}"
+                       CONFIGURATIONS Debug
-                       CONFIGURATIONS Debug
+                       DESTINATION "${INSTALL_DIR_LIB}d"
-                       DESTINATION "${INSTALL_DIR_LIB}d"
+                       RENAME ${FREEIMLIB}.3)
-                       RENAME ${FREEIMLIB}.3)
+            endif()
-            endif()
+          endif()
-          endif()
+
-
+        endif()
-        endif()
+      else()
-      else()
+        # the library directory for using by the executable
-        # the library directory for using by the executable
+        foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-        foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+          string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-          string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+          if (WIN32)
-          if (WIN32)
+            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
-            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
+          else()
-          else()
+            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
-            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
+          endif()
-          endif()
+        endforeach()
-        endforeach()
+        if (WIN32)
-        if (WIN32)
+          set (USED_3RDPARTY_${PRODUCT_NAME}_DIR ${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}})
-          set (USED_3RDPARTY_${PRODUCT_NAME}_DIR ${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}})
+        endif()
-        endif()
+      endif()
-      endif()
+
-
+      mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})
-      mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})
+#    endif()
-#    endif()
+  endforeach()
-  endforeach()
+endmacro()
-endmacro()
+
-
+macro (COMPLIANCE_PRODUCT_CONSISTENCY LIBNAME)
-macro (COMPLIANCE_PRODUCT_CONSISTENCY LIBNAME)
+  if (3RDPARTY_${LIBNAME}_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DIR}")
-  if (3RDPARTY_${LIBNAME}_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DIR}")
+    # include dir
-    # include dir
+    set (DOES_PATH_CONTAIN FALSE)
-    set (DOES_PATH_CONTAIN FALSE)
+    if (3RDPARTY_${LIBNAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
-    if (3RDPARTY_${LIBNAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
+      string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
-      string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
+    endif()
-    endif()
+    if (NOT DOES_PATH_CONTAIN)
-    if (NOT DOES_PATH_CONTAIN)
+      set (3RDPARTY_${LIBNAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of ${LIBNAME}" FORCE)
-      set (3RDPARTY_${LIBNAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of ${LIBNAME}" FORCE)
+    endif()
-    endif()
+
-
+    if (BUILD_SHARED_LIBS)
-    if (BUILD_SHARED_LIBS)
+      # library dir
-      # library dir
+      set (DOES_PATH_CONTAIN FALSE)
-      set (DOES_PATH_CONTAIN FALSE)
+      if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
-      if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
-        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+      endif()
-      endif()
+      if (NOT DOES_PATH_CONTAIN)
-      if (NOT DOES_PATH_CONTAIN)
+        set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
-        set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
+      endif()
-      endif()
+
-
+      # shared library dir
-      # shared library dir
+      if (WIN32)
-      if (WIN32)
+        set (DOES_PATH_CONTAIN FALSE)
-        set (DOES_PATH_CONTAIN FALSE)
+        if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
-        if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+          string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL_DIR}")
-          string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+        endif()
-        endif()
+        if (NOT DOES_PATH_CONTAIN)
-        if (NOT DOES_PATH_CONTAIN)
+          set (3RDPARTY_${LIBNAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} shared library" FORCE)
-          set (3RDPARTY_${LIBNAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} shared library" FORCE)
+        endif()
-        endif()
+      endif()
-      endif()
+    endif()
-    endif()
+  endif()
-  endif()
+
-
+  if (BUILD_SHARED_LIBS)
-  if (BUILD_SHARED_LIBS)
+    # check library
-    # check library
+    set (DOES_PATH_CONTAIN FALSE)
-    set (DOES_PATH_CONTAIN FALSE)
+    if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
-    if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+      if (3RDPARTY_${LIBNAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
-      if (3RDPARTY_${LIBNAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
+        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY}")
-        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY}")
+      endif()
-      endif()
+    endif()
-    endif()
+    if (NOT DOES_PATH_CONTAIN)
-    if (NOT DOES_PATH_CONTAIN)
+      set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
-      set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
+    endif()
-    endif()
+
-
+    # check shared library
-    # check shared library
+    if (WIN32)
-    if (WIN32)
+      set (DOES_PATH_CONTAIN FALSE)
-      set (DOES_PATH_CONTAIN FALSE)
+      if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
-      if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+        if (3RDPARTY_${LIBNAME}_DLL AND EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
-        if (3RDPARTY_${LIBNAME}_DLL AND EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
+          string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DLL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL}")
-          string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DLL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL}")
+        endif()
-        endif()
+      endif()
-      endif()
+      if (NOT DOES_PATH_CONTAIN)
-      if (NOT DOES_PATH_CONTAIN)
+        set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
-        set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
+      endif()
-      endif()
+    endif()
-    endif()
+  endif()
-  endif()
+endmacro()
-endmacro()

adm/cmake/bison.cmake

@@ -1,25 +1,25 @@
-# bison
+# bison
-
+
-# execute FindBISON script by "find_package (Bison)" is required to define BISON_TARGET macro
+# execute FindBISON script by "find_package (Bison)" is required to define BISON_TARGET macro
-
+
-# delete obsolete 3RDPARTY_BISON_EXECUTABLE cache variable (not used anymore)
+# delete obsolete 3RDPARTY_BISON_EXECUTABLE cache variable (not used anymore)
-unset (3RDPARTY_BISON_EXECUTABLE CACHE)
+unset (3RDPARTY_BISON_EXECUTABLE CACHE)
-
+
-# delete BISON_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
+# delete BISON_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
-# without reasonable diagnostic
+# without reasonable diagnostic
-if (NOT BISON_EXECUTABLE OR NOT EXISTS "${BISON_EXECUTABLE}")
+if (NOT BISON_EXECUTABLE OR NOT EXISTS "${BISON_EXECUTABLE}")
-  unset (BISON_EXECUTABLE CACHE)
+  unset (BISON_EXECUTABLE CACHE)
-endif()
+endif()
-
+
-# Add paths to 3rdparty subfolders containing name "bison" to CMAKE_PROGRAM_PATH variable to make
+# Add paths to 3rdparty subfolders containing name "bison" to CMAKE_PROGRAM_PATH variable to make
-# these paths searched by find_package
+# these paths searhed by find_package
-if (3RDPARTY_DIR)
+if (3RDPARTY_DIR)
-  file (GLOB BISON_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*bison*/")
+  file (GLOB BISON_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*bison*/")
-  foreach (candidate_path ${BISON_PATHS})
+  foreach (candidate_path ${BISON_PATHS})
-    if (IS_DIRECTORY ${candidate_path})
+    if (IS_DIRECTORY ${candidate_path})
-      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
+      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-endif()
+endif()
- 
+ 
-find_package (BISON 3.7.4)
+find_package (BISON 3.7.4)

adm/cmake/doxygen.cmake

@@ -1,62 +1,62 @@
-# doxygen
+# doxygen
-set (DOXYGEN_MINIMUM_VERSION 1.8.4)
+set (DOXYGEN_MINIMUM_VERSION 1.8.4)
-
+
-if (DO_ONLY_CHECK_FOR_DOXYGEN)
+if (DO_ONLY_CHECK_FOR_DOXYGEN)
-  message (STATUS "Info. Detecting doxygen")
+  message (STATUS "Info. Detecting doxygen")
-  set (DOXYGEN_SKIP_DOT ON)
+  set (DOXYGEN_SKIP_DOT ON)
-  find_package (Doxygen ${DOXYGEN_MINIMUM_VERSION})
+  find_package (Doxygen ${DOXYGEN_MINIMUM_VERSION})
-
+
-  set (CAN_DOXYGEN_BE_USED OFF)
+  set (CAN_DOXYGEN_BE_USED OFF)
-  if (DOXYGEN_EXECUTABLE)
+  if (DOXYGEN_EXECUTABLE)
-    set (CAN_DOXYGEN_BE_USED ON)
+    set (CAN_DOXYGEN_BE_USED ON)
-    message (STATUS "Info. Doxygen is found and can be used")
+    message (STATUS "Info. Doxygen is found and can be used")
-  endif()
+  endif()
-else()
+else()
-  set (3RDPARTY_DOT_EXECUTABLE_DESCR       "The path to the 'dot' tool producing layered drawings of directed graphs.\nThis tool used by doxygen")
+  set (3RDPARTY_DOT_EXECUTABLE_DESCR       "The path to the 'dot' tool producing layered drawings of directed graphs.\nThis tool used by doxygen")
-  set (3RDPARTY_DOXYGEN_EXECUTABLE_DESCR   "The path to the doxygen command")
+  set (3RDPARTY_DOXYGEN_EXECUTABLE_DESCR   "The path to the doxygen command")
-
+
-  if (NOT DEFINED 3RDPARTY_DOXYGEN_EXECUTABLE)
+  if (NOT DEFINED 3RDPARTY_DOXYGEN_EXECUTABLE)
-    set (3RDPARTY_DOXYGEN_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}")
+    set (3RDPARTY_DOXYGEN_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}")
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_DOT_EXECUTABLE)
+  if (NOT DEFINED 3RDPARTY_DOT_EXECUTABLE)
-    set (3RDPARTY_DOT_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}")
+    set (3RDPARTY_DOT_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}")
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_SKIP_DOT_EXECUTABLE)
+  if (NOT DEFINED 3RDPARTY_SKIP_DOT_EXECUTABLE)
-    set (3RDPARTY_SKIP_DOT_EXECUTABLE ON CACHE BOOL "Skip trying to find Dot")
+    set (3RDPARTY_SKIP_DOT_EXECUTABLE ON CACHE BOOL "Skip trying to find Dot")
-  endif()
+  endif()
-
+
-  if (3RDPARTY_SKIP_DOT_EXECUTABLE)
+  if (3RDPARTY_SKIP_DOT_EXECUTABLE)
-    OCCT_CHECK_AND_UNSET (3RDPARTY_DOT_EXECUTABLE)
+    OCCT_CHECK_AND_UNSET (3RDPARTY_DOT_EXECUTABLE)
-  endif()
+  endif()
-
+
-  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE))
+  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE))
-
+
-    set (DOXYGEN_SKIP_DOT ${3RDPARTY_SKIP_DOT_EXECUTABLE})
+    set (DOXYGEN_SKIP_DOT ${3RDPARTY_SKIP_DOT_EXECUTABLE})
-    find_package (Doxygen ${DOXYGEN_MINIMUM_VERSION})
+    find_package (Doxygen ${DOXYGEN_MINIMUM_VERSION})
-    
+    
-    if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE AND DOXYGEN_EXECUTABLE)
+    if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE AND DOXYGEN_EXECUTABLE)
-      set (3RDPARTY_DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}" FORCE)
+      set (3RDPARTY_DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}" FORCE)
-    endif()
+    endif()
-    
+    
-    if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE AND DOXYGEN_DOT_EXECUTABLE)
+    if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE AND DOXYGEN_DOT_EXECUTABLE)
-      set (3RDPARTY_DOT_EXECUTABLE "${DOXYGEN_DOT_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}" FORCE)
+      set (3RDPARTY_DOT_EXECUTABLE "${DOXYGEN_DOT_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOXYGEN_EXECUTABLE}")
+  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOXYGEN_EXECUTABLE}")
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOXYGEN_EXECUTABLE)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOXYGEN_EXECUTABLE)
-  endif()
+  endif()
-
+
-  if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE)
+  if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE)
-    if (NOT 3RDPARTY_DOT_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOT_EXECUTABLE}")
+    if (NOT 3RDPARTY_DOT_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOT_EXECUTABLE}")
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOT_EXECUTABLE)
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOT_EXECUTABLE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# unset all redundant variables
+# unset all redundant variables
-OCCT_CHECK_AND_UNSET (DOXYGEN_SKIP_DOT)
+OCCT_CHECK_AND_UNSET (DOXYGEN_SKIP_DOT)
-OCCT_CHECK_AND_UNSET (DOXYGEN_EXECUTABLE)
+OCCT_CHECK_AND_UNSET (DOXYGEN_EXECUTABLE)
-OCCT_CHECK_AND_UNSET (DOXYGEN_DOT_EXECUTABLE)
+OCCT_CHECK_AND_UNSET (DOXYGEN_DOT_EXECUTABLE)

adm/cmake/draco.cmake

@@ -1,113 +1,96 @@
-# Draco - a library for a lossy vertex data compression, used as extension to glTF format.
+# Draco - a library for a lossy vertex data compression, used as extension to glTF format.
-# https://github.com/google/draco
+# https://github.com/google/draco
-
+
-macro (SEARCH_DRACO_LIB)
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+
-    if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
+if (NOT DEFINED INSTALL_DRACO)
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+  set (INSTALL_DRACO OFF CACHE BOOL "${INSTALL_DRACO_DESCR}")
-      set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
+endif()
-  
+
-      find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
+if (NOT DEFINED 3RDPARTY_DRACO_DIR)
-                                           PATHS "${3RDPARTY_DRACO_DIR}"
+  set (3RDPARTY_DRACO_DIR "" CACHE PATH "The directory containing Draco")
-                                           PATH_SUFFIXES lib
+endif()
-                                           CMAKE_FIND_ROOT_PATH_BOTH
+
-                                           NO_DEFAULT_PATH)
+if (NOT DEFINED 3RDPARTY_DRACO_INCLUDE_DIR)
-      if (3RDPARTY_DRACO_LIBRARY AND EXISTS "${3RDPARTY_DRACO_LIBRARY}")
+  set (3RDPARTY_DRACO_INCLUDE_DIR  "" CACHE PATH "The directory containing headers of the Draco")
-        get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY}" PATH)
+endif()
-        set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
+
-      endif()
+if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY OR NOT 3RDPARTY_DRACO_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
-    endif()
+  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library"  FORCE)
-  
+endif()
-    if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
+
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR)
-      set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
+  set (3RDPARTY_DRACO_LIBRARY_DIR "" CACHE PATH "The directory containing Draco library")
-  
+endif()
-      find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
+
-                                           PATHS "${3RDPARTY_DRACO_DIR}"
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-                                           PATH_SUFFIXES libd debug/lib
+  if (NOT 3RDPARTY_DRACO_DIR OR NOT EXISTS "${3RDPARTY_DRACO_DIR}")
-                                           CMAKE_FIND_ROOT_PATH_BOTH
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" draco DRACO_DIR_NAME)
-                                           NO_DEFAULT_PATH)
+    if (DRACO_DIR_NAME)
-      if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
+      set (3RDPARTY_DRACO_DIR "${3RDPARTY_DIR}/${DRACO_DIR_NAME}" CACHE PATH "The directory containing Draco" FORCE)
-        get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
+    endif()
-        set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
+  endif()
-      endif()
+endif()
-    endif()
+
-  endif()
+if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-endmacro()
+  set (DRACO_INCLUDE_PATH "${3RDPARTY_DRACO_DIR}/include")
-
+  set (DRACO_LIBRARY_PATH "${3RDPARTY_DRACO_DIR}/lib")
-# vcpkg processing
+endif()
-if (BUILD_USE_VCPKG)
+
-  find_package (draco CONFIG REQUIRED)
+if (NOT 3RDPARTY_DRACO_INCLUDE_DIR)
-
+  if (DRACO_INCLUDE_PATH AND EXISTS "${DRACO_INCLUDE_PATH}")
-  set (3RDPARTY_DRACO_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+    set (3RDPARTY_DRACO_INCLUDE_DIR "${DRACO_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of DRACO" FORCE)
-  SEARCH_DRACO_LIB()
+  endif()
-
+endif()
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/draco")
+
-  return()
+if (NOT 3RDPARTY_DRACO_LIBRARY_DIR)
-endif()
+  if (DRACO_LIBRARY_PATH AND EXISTS "${DRACO_LIBRARY_PATH}")
-
+    set (3RDPARTY_DRACO_LIBRARY_DIR "${DRACO_LIBRARY_PATH}" CACHE FILEPATH "The directory containing DRACO library" FORCE)
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+  endif()
-
+endif()
-if (NOT DEFINED 3RDPARTY_DRACO_DIR)
+
-  set (3RDPARTY_DRACO_DIR "" CACHE PATH "The directory containing Draco")
+if (3RDPARTY_DRACO_INCLUDE_DIR AND EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-
+else()
-if (NOT DEFINED 3RDPARTY_DRACO_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DRACO_INCLUDE_DIR)
-  set (3RDPARTY_DRACO_INCLUDE_DIR  "" CACHE PATH "The directory containing headers of the Draco")
+endif()
-endif()
+
-
+if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY)
+  if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library")
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
-endif()
+    set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
-
+
-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR)
+    find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
-  set (3RDPARTY_DRACO_LIBRARY_DIR "" CACHE PATH "The directory containing Draco library")
+                                         PATHS "${3RDPARTY_DRACO_LIBRARY_DIR}"
-endif()
+                                         PATH_SUFFIXES lib
-
+                                         CMAKE_FIND_ROOT_PATH_BOTH
-if (WIN32)
+                                         NO_DEFAULT_PATH)
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DEBUG)
+    if (3RDPARTY_DRACO_LIBRARY AND EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "" CACHE FILEPATH "Draco debug library")
+      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY}" PATH)
-  endif()
+      set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
-  
+    endif()
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR_DEBUG)
+  endif()
-    set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "" CACHE PATH "The directory containing Draco debug library")
+endif()
-  endif()
+
-endif()
+if (3RDPARTY_DRACO_LIBRARY_DIR AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
-
+  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_DRACO_LIBRARY_DIR}")
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+else()
-  if (NOT 3RDPARTY_DRACO_DIR OR NOT EXISTS "${3RDPARTY_DRACO_DIR}")
+  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_DRACO_LIBRARY_DIR)
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" draco DRACO_DIR_NAME)
+endif()
-    if (DRACO_DIR_NAME)
+
-      set (3RDPARTY_DRACO_DIR "${3RDPARTY_DIR}/${DRACO_DIR_NAME}" CACHE PATH "The directory containing Draco" FORCE)
+if (INSTALL_DRACO)
-    endif()
+  get_filename_component(3RDPARTY_DRACO_LIBRARY_REALPATH ${3RDPARTY_DRACO_LIBRARY} REALPATH)
-  endif()
+  if (SINGLE_GENERATOR)
-endif()
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
-
+  else()
-# header
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
-if (NOT 3RDPARTY_DRACO_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
+             CONFIGURATIONS Release
-  set (HEADER_NAMES draco)
+             DESTINATION "${INSTALL_DIR_LIB}")
-
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
-  # set 3RDPARTY_DRACO_INCLUDE_DIR as notfound, otherwise find_path can't assign a new value to 3RDPARTY_DRACO_INCLUDE_DIR
+             CONFIGURATIONS RelWithDebInfo
-  set (3RDPARTY_DRACO_INCLUDE_DIR "3RDPARTY_DRACO_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing headers of the Draco" FORCE)
+             DESTINATION "${INSTALL_DIR_LIB}i")
-
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
-  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+             CONFIGURATIONS Debug
-    find_path (3RDPARTY_DRACO_INCLUDE_DIR NAMES ${HEADER_NAMES}
+             DESTINATION "${INSTALL_DIR_LIB}d")
-                                                 PATHS ${3RDPARTY_DRACO_DIR}
+  endif()
-                                                 PATH_SUFFIXES "include"
+endif()
-                                                 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()

adm/cmake/egl.cmake

@@ -1,3 +1,3 @@
-# EGL
+# EGL
-
+
-THIRDPARTY_PRODUCT("EGL" "EGL/egl.h" "CSF_OpenGlesLibs" "")
+THIRDPARTY_PRODUCT("EGL" "EGL/egl.h" "CSF_OpenGlesLibs" "")

adm/cmake/eigen.cmake

@@ -1,87 +1,87 @@
-# eigen
+# eigen
-
+
-if (NOT DEFINED INSTALL_EIGEN)
+if (NOT DEFINED INSTALL_EIGEN)
-  set (INSTALL_EIGEN OFF CACHE BOOL "${INSTALL_EIGEN_DESCR}")
+  set (INSTALL_EIGEN OFF CACHE BOOL "${INSTALL_EIGEN_DESCR}")
-endif()
+endif()
-
+
-# eigen directory
+# eigen directory
-if (NOT DEFINED 3RDPARTY_EIGEN_DIR)
+if (NOT DEFINED 3RDPARTY_EIGEN_DIR)
-  set (3RDPARTY_EIGEN_DIR "" CACHE PATH "The directory containing eigen")
+  set (3RDPARTY_EIGEN_DIR "" CACHE PATH "The directory containing eigen")
-endif()
+endif()
-
+
-# search for eigen in user defined directory
+# search for eigen in user defined directory
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_EIGEN_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_DIR}")
+  if (NOT 3RDPARTY_EIGEN_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_DIR}")
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" Eigen EIGEN_DIR_NAME)
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" Eigen EIGEN_DIR_NAME)
-    if (EIGEN_DIR_NAME)
+    if (EIGEN_DIR_NAME)
-      set (3RDPARTY_EIGEN_DIR "${3RDPARTY_DIR}/${EIGEN_DIR_NAME}" CACHE PATH "The directory containing eigen" FORCE)
+      set (3RDPARTY_EIGEN_DIR "${3RDPARTY_DIR}/${EIGEN_DIR_NAME}" CACHE PATH "The directory containing eigen" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_EIGEN_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_EIGEN_INCLUDE_DIR)
-  set (3RDPARTY_EIGEN_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the EIGEN")
+  set (3RDPARTY_EIGEN_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the EIGEN")
-endif()
+endif()
-
+
-if (NOT 3RDPARTY_EIGEN_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
+if (NOT 3RDPARTY_EIGEN_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
-
+
-  set (HEADER_NAMES Eigen)
+  set (HEADER_NAMES Eigen)
-
+
-  set (3RDPARTY_EIGEN_INCLUDE_DIR "3RDPARTY_EIGEN_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to Eigen header file" FORCE)
+  set (3RDPARTY_EIGEN_INCLUDE_DIR "3RDPARTY_EIGEN_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to Eigen header file" FORCE)
-
+
-  if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
+  if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
-    find_path (3RDPARTY_EIGEN_INCLUDE_DIR NAMES ${HEADER_NAMES}
+    find_path (3RDPARTY_EIGEN_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATHS ${3RDPARTY_EIGEN_DIR}
+                                              PATHS ${3RDPARTY_EIGEN_DIR}
-                                              PATH_SUFFIXES include eigen3 include/eigen3
+                                              PATH_SUFFIXES include eigen3 include/eigen3
-                                              CMAKE_FIND_ROOT_PATH_BOTH
+                                              CMAKE_FIND_ROOT_PATH_BOTH
-                                              NO_DEFAULT_PATH)
+                                              NO_DEFAULT_PATH)
-  else()
+  else()
-    find_path (3RDPARTY_EIGEN_INCLUDE_DIR NAMES ${HEADER_NAMES}
+    find_path (3RDPARTY_EIGEN_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATH_SUFFIXES include eigen3 include/eigen3
+                                              PATH_SUFFIXES include eigen3 include/eigen3
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
+  endif()
-
+
-  # use default (CMake) EIGEN search
+  # use default (CMake) EIGEN search
-  if (NOT 3RDPARTY_EIGEN_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
+  if (NOT 3RDPARTY_EIGEN_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
-    # use 3RDPARTY_EIGEN_DIR if it is specified for eigen search
+    # use 3RDPARTY_EIGEN_DIR if it is specified for eigen search
-    if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
+    if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
-      set (CACHED_EIGEN_DIR $ENV{Eigen3_DIR})
+      set (CACHED_EIGEN_DIR $ENV{Eigen3_DIR})
-      set (ENV{Eigen3_DIR} "${3RDPARTY_EIGEN_DIR}")
+      set (ENV{Eigen3_DIR} "${3RDPARTY_EIGEN_DIR}")
-    endif()
+    endif()
-
+
-    find_package(Eigen3 QUIET)
+    find_package(Eigen3 QUIET)
-
+
-    # restore ENV{Eigen3_DIR}
+    # restore ENV{Eigen3_DIR}
-    if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
+    if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
-      set (ENV{Eigen3_DIR} ${CACHED_EIGEN_DIR})
+      set (ENV{Eigen3_DIR} ${CACHED_EIGEN_DIR})
-    endif()
+    endif()
-
+
-    if (${EIGEN3_FOUND})
+    if (${EIGEN3_FOUND})
-      set (3RDPARTY_EIGEN_INCLUDE_DIR "${EIGEN3_INCLUDE_DIR}" CACHE PATH "the path to Eigen header file" FORCE)
+      set (3RDPARTY_EIGEN_INCLUDE_DIR "${EIGEN3_INCLUDE_DIR}" CACHE PATH "the path to Eigen header file" FORCE)
-      set (3RDPARTY_EIGEN_DIR "${EIGEN3_ROOT_DIR}"    CACHE PATH "The directory containing eigen" FORCE)
+      set (3RDPARTY_EIGEN_DIR "${EIGEN3_ROOT_DIR}"    CACHE PATH "The directory containing eigen" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (3RDPARTY_EIGEN_INCLUDE_DIR AND EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
+if (3RDPARTY_EIGEN_INCLUDE_DIR AND EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
-
+
-  # Install header files
+  # Install header files
-  if (INSTALL_EIGEN)
+  if (INSTALL_EIGEN)
-    file(GLOB EIGEN_SUBDIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}/*")
+    file(GLOB EIGEN_SUBDIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}/*")
-    foreach(SUBDIR ${EIGEN_SUBDIRS})
+    foreach(SUBDIR ${EIGEN_SUBDIRS})
-      if(IS_DIRECTORY "${SUBDIR}")
+      if(IS_DIRECTORY "${SUBDIR}")
-        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      else()
+      else()
-        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      endif()
+      endif()
-    endforeach()
+    endforeach()
-  endif()
+  endif()
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_EIGEN_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_EIGEN_INCLUDE_DIR)
-
+
-  set (3RDPARTY_EIGEN_INCLUDE_DIR "" CACHE PATH "the path to Eigen header file" FORCE)
+  set (3RDPARTY_EIGEN_INCLUDE_DIR "" CACHE PATH "the path to Eigen header file" FORCE)
-endif()
+endif()
-
+
-# unset all redundant variables
+# unset all redundant variables
-OCCT_CHECK_AND_UNSET(Eigen3_DIR)
+OCCT_CHECK_AND_UNSET(Eigen3_DIR)

adm/cmake/ffmpeg.cmake

@@ -1,253 +1,242 @@
-# vcpkg processing
+# FFmpeg
-if (BUILD_USE_VCPKG)
+
-  find_package(FFMPEG REQUIRED)
+if (NOT DEFINED INSTALL_FFMPEG)
-  set(CSF_FFmpeg ${FFMPEG_LIBRARIES})
+  set (INSTALL_FFMPEG OFF CACHE BOOL "${INSTALL_FFMPEG_DESCR}")
-  if (WIN32)
+endif()
-    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+
-  else()
+if (NOT DEFINED 3RDPARTY_FFMPEG_DIR)
-    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  set (3RDPARTY_FFMPEG_DIR "" CACHE PATH "The directory containing FFmpeg")
-  endif()
+endif()
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS}")
+
-  return()
+# include occt macros. compiler_bitness, os_with_bit, compiler
-endif()
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-if (NOT DEFINED INSTALL_FFMPEG)
+# specify FFMPEG folder in connection with 3RDPARTY_DIR
-  set (INSTALL_FFMPEG OFF CACHE BOOL "${INSTALL_FFMPEG_DESCR}")
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-endif()
+  if (NOT 3RDPARTY_FFMPEG_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_DIR}")
-
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FFMPEG FFMPEG_DIR_NAME)
-if (NOT DEFINED 3RDPARTY_FFMPEG_DIR)
+    if (FFMPEG_DIR_NAME)
-  set (3RDPARTY_FFMPEG_DIR "" CACHE PATH "The directory containing FFmpeg")
+      set (3RDPARTY_FFMPEG_DIR "${3RDPARTY_DIR}/${FFMPEG_DIR_NAME}" CACHE PATH "The directory containing FFmpeg" FORCE)
-endif()
+    endif()
-
+  endif()
-# include occt macros. compiler_bitness, os_with_bit, compiler
+else()
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+endif()
-
+
-# specify FFMPEG folder in connection with 3RDPARTY_DIR
+# define required FFMPEG variables
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+if (NOT DEFINED 3RDPARTY_FFMPEG_INCLUDE_DIR)
-  if (NOT 3RDPARTY_FFMPEG_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_DIR}")
+  set (3RDPARTY_FFMPEG_INCLUDE_DIR  "" CACHE PATH "the path of headers directory")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FFMPEG FFMPEG_DIR_NAME)
+endif()
-    if (FFMPEG_DIR_NAME)
+
-      set (3RDPARTY_FFMPEG_DIR "${3RDPARTY_DIR}/${FFMPEG_DIR_NAME}" CACHE PATH "The directory containing FFmpeg" FORCE)
+separate_arguments (CSF_FFmpeg)
-    endif()
+foreach (LIBRARY_NAME ${CSF_FFmpeg})
-  endif()
+  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
-else()
+    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}               "" CACHE FILEPATH "FFmpeg framework (${LIBRARY_NAME})" FORCE)
-endif()
+  endif()
-
+
-# define required FFMPEG variables
+  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
-if (NOT DEFINED 3RDPARTY_FFMPEG_INCLUDE_DIR)
+    set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing FFmpeg framework (${LIBRARY_NAME})")
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR  "" CACHE PATH "the path of headers directory")
+  endif()
-endif()
+
-
+  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR)
-separate_arguments (CSF_FFmpeg)
+    set (3RDPARTY_FFMPEG_LIBRARY_DIR                           "" CACHE PATH "The directory containing FFmpeg libraries")
-foreach (LIBRARY_NAME ${CSF_FFmpeg})
+  endif()
-  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
+
-    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}               "" CACHE FILEPATH "FFmpeg framework (${LIBRARY_NAME})" FORCE)
+  if (WIN32)
-  endif()
+    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
-
+      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "FFmpeg shared libraries (${LIBRARY_NAME})" FORCE)
-  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
+    endif()
-    set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing FFmpeg framework (${LIBRARY_NAME})")
+  endif()
-  endif()
+
-
+  if (WIN32)
-  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR)
+    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
-    set (3RDPARTY_FFMPEG_LIBRARY_DIR                           "" CACHE PATH "The directory containing FFmpeg libraries")
+      set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}               "" CACHE PATH "The directory containing FFmpeg shared libraries (${LIBRARY_NAME})")
-  endif()
+    endif()
-
+    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR)
-  if (WIN32)
+      set (3RDPARTY_FFMPEG_DLL_DIR                               "" CACHE PATH "The directory containing FFmpeg shared libraries")
-    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
+    endif()
-      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "FFmpeg shared libraries (${LIBRARY_NAME})" FORCE)
+  endif()
-    endif()
+
-  endif()
+  # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
-
+  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-  if (WIN32)
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_INCLUDE_DIR PATH "the path to FFmpeg")
-    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to FFmpeg framework (${LIBRARY_NAME})")
-      set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}               "" CACHE PATH "The directory containing FFmpeg shared libraries (${LIBRARY_NAME})")
+
-    endif()
+    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
-    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR)
+      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
-      set (3RDPARTY_FFMPEG_DLL_DIR                               "" CACHE PATH "The directory containing FFmpeg shared libraries")
+      set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg libraries" FORCE)
-    endif()
+      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
-  endif()
+    else()
-
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg library (${LIBRARY_NAME})")
-  # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
+    endif()
-  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
+
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_INCLUDE_DIR PATH "the path to FFmpeg")
+    if (WIN32)
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to FFmpeg framework (${LIBRARY_NAME})")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} FILEPATH "the path to FFmpeg shared library (${LIBRARY_NAME})")
-
+
-    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
+      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
-      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
+        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg libraries" FORCE)
+        set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared libraries" FORCE)
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
+        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
-    else()
+      else()
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg library (${LIBRARY_NAME})")
+        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})")
-    endif()
+      endif()
-
+    endif()
-    if (WIN32)
+  endif()
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} FILEPATH "the path to FFmpeg shared library (${LIBRARY_NAME})")
+endforeach()
-
+
-      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
+# header
-        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
+if (NOT 3RDPARTY_FFMPEG_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-        set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared libraries" FORCE)
+  set (HEADER_NAMES avutil.h libavutil/avutil.h)
-        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
+
-      else()
+  # set 3RDPARTY_FFMPEG_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_INCLUDE_DIR
-        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})")
+  set (3RDPARTY_FFMPEG_INCLUDE_DIR "3RDPARTY_FFMPEG_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to header directory" FORCE)
-      endif()
+
-    endif()
+  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-  endif()
+    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
-endforeach()
+                                                 PATHS ${3RDPARTY_FFMPEG_DIR}
-
+                                                 PATH_SUFFIXES include
-# header
+                                                 CMAKE_FIND_ROOT_PATH_BOTH
-if (NOT 3RDPARTY_FFMPEG_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
+                                                 NO_DEFAULT_PATH)
-  set (HEADER_NAMES avutil.h libavutil/avutil.h)
+  else()
-
+    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
-  # set 3RDPARTY_FFMPEG_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_INCLUDE_DIR
+                                                 PATH_SUFFIXES include
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR "3RDPARTY_FFMPEG_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to header directory" FORCE)
+                                                 CMAKE_FIND_ROOT_PATH_BOTH)
-
+  endif()
-  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
+endif()
-    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
+
-                                                 PATHS ${3RDPARTY_FFMPEG_DIR}
+if (3RDPARTY_FFMPEG_INCLUDE_DIR AND EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-                                                 PATH_SUFFIXES include
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-                                                 CMAKE_FIND_ROOT_PATH_BOTH
+else()
-                                                 NO_DEFAULT_PATH)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_INCLUDE_DIR)
-  else()
+
-    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
+  set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE FILEPATH "the path to avutil.h" FORCE)
-                                                 PATH_SUFFIXES include
+endif()
-                                                 CMAKE_FIND_ROOT_PATH_BOTH)
+
-  endif()
+# libraries
-endif()
+foreach (LIBRARY_NAME ${CSF_FFmpeg})
-
+  if (NOT 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
-if (3RDPARTY_FFMPEG_INCLUDE_DIR AND EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
+
-else()
+    set (FFMPEG_PATH_SUFFIXES lib)
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_INCLUDE_DIR)
+    if (ANDROID)
-
+      set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} libs/${ANDROID_ABI})
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE FILEPATH "the path to avutil.h" FORCE)
+    elseif(APPLE)
-endif()
+      set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} Frameworks)
-
+    endif()
-# libraries
+
-foreach (LIBRARY_NAME ${CSF_FFmpeg})
+    # set 3RDPARTY_FFMPEG_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_LIBRARY
-  if (NOT 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
+    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+
-
+    if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-    set (FFMPEG_PATH_SUFFIXES lib)
+      find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
-    if (ANDROID)
+                    PATHS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_FFMPEG_DIR}"
-      set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} libs/${ANDROID_ABI})
+                    PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
-    elseif(APPLE)
+                    CMAKE_FIND_ROOT_PATH_BOTH
-      set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} Frameworks)
+                    NO_DEFAULT_PATH)
-    endif()
+    else()
-
+      find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
-    # set 3RDPARTY_FFMPEG_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_LIBRARY
+                    PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
-    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
+                    CMAKE_FIND_ROOT_PATH_BOTH)
-
+    endif()
-    if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
+
-      find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
+    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
-                    PATHS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_FFMPEG_DIR}"
+      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
-                    PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
+      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
-                    CMAKE_FIND_ROOT_PATH_BOTH
+    else()
-                    NO_DEFAULT_PATH)
+      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
-    else()
+    endif()
-      find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
+  endif()
-                    PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
+
-                    CMAKE_FIND_ROOT_PATH_BOTH)
+  if (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
-    endif()
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
-
+  else()
-    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
-      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
+
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
+    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
-    else()
+  endif()
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
+
-    endif()
+  # shared library
-  endif()
+  if (WIN32)
-
+    if (NOT 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
-  if (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
+
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-  else()
+      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg shared library (${LIBRARY_NAME})" FORCE)
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
+
-
+      # find FFmpeg shared library
-    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
+      file (GLOB 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DIR}/bin/${LIBRARY_NAME}[-][0-9]*")
-  endif()
+
-
+      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
-  # shared library
+        set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" CACHE FILEPATH "FFmpeg shared library (${LIBRARY_NAME})" FORCE)
-  if (WIN32)
+        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
-    if (NOT 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
+        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
-
+      else()
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
-      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg shared library (${LIBRARY_NAME})" FORCE)
+      endif()
-
+    endif()
-      # find FFmpeg shared library
+
-      file (GLOB 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DIR}/bin/${LIBRARY_NAME}[-][0-9]*")
+    if (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
-
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
-      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
+    else()
-        set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" CACHE FILEPATH "FFmpeg shared library (${LIBRARY_NAME})" FORCE)
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
-        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
+    endif()
-        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
+  endif()
-      else()
+
-        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
+  # install instructions
-      endif()
+  if (INSTALL_FFMPEG)
-    endif()
+    OCCT_MAKE_OS_WITH_BITNESS()
-
+    OCCT_MAKE_COMPILER_SHORT_NAME()
-    if (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
+
-      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
+    if (WIN32)
-    else()
+      if (DEFINED INSTALL_BIN_DIR)
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
+        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" DESTINATION "${INSTALL_BIN_DIR}")
-    endif()
+      else()
-  endif()
+        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
-
+                 CONFIGURATIONS Release
-  # install instructions
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}")
-  if (INSTALL_FFMPEG)
+        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
-    OCCT_MAKE_OS_WITH_BITNESS()
+                 CONFIGURATIONS RelWithDebInfo
-    OCCT_MAKE_COMPILER_SHORT_NAME()
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}i")
-
+        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
-    if (WIN32)
+                 CONFIGURATIONS Debug
-      if (DEFINED INSTALL_BIN_DIR)
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}d")
-        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" DESTINATION "${INSTALL_BIN_DIR}")
+      endif()
-      else()
+    else()
-        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
+      get_filename_component(3RDPARTY_FFMPEG_LIBRARY_ABS ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} REALPATH)
-                 CONFIGURATIONS Release
+      get_filename_component(3RDPARTY_FFMPEG_LIBRARY_NAME ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} NAME)
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}")
+
-        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
+      if (DEFINED INSTALL_LIB_DIR)
-                 CONFIGURATIONS RelWithDebInfo
+        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_LIB_DIR}"
-        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
+                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-                 CONFIGURATIONS Debug
+      else()
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}d")
+        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-      endif()
+                 CONFIGURATIONS Release
-    else()
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-      get_filename_component(3RDPARTY_FFMPEG_LIBRARY_ABS ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} REALPATH)
+                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-      get_filename_component(3RDPARTY_FFMPEG_LIBRARY_NAME ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} NAME)
+        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-
+                 CONFIGURATIONS RelWithDebInfo
-      if (DEFINED INSTALL_LIB_DIR)
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
+                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-                 DESTINATION "${INSTALL_LIB_DIR}"
+        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
+                 CONFIGURATIONS Debug
-      else()
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
+                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-                 CONFIGURATIONS Release
+      endif()
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+    endif()
-                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
+
-        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
+    set (USED_3RDPARTY_FFMPEG_DIR "")
-                 CONFIGURATIONS RelWithDebInfo
+  else()
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+    # the library directory for using by the executable
-                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
+    if (WIN32)
-        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
+      set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}})
-                 CONFIGURATIONS Debug
+    else()
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+      set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}})
-                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
+    endif()
-      endif()
+  endif()
-    endif()
+
-
+  mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME})
-    set (USED_3RDPARTY_FFMPEG_DIR "")
+endforeach()
-  else()
+
-    # the library directory for using by the executable
+# unset all redundant variables
-    if (WIN32)
+OCCT_CHECK_AND_UNSET (FFMPEG_INCLUDE_DIRS)
-      set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}})
+OCCT_CHECK_AND_UNSET (FFMPEG_LIBRARY_DIRS)
-    else()
+OCCT_CHECK_AND_UNSET (FFMPEG_DIR)
-      set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}})
-    endif()
-  endif()
-
-  mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME})
-endforeach()
-
-# 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

@@ -1,43 +1,33 @@
-# flex
+# flex
-
+
-# execute FindFLEX script by "find_package (Flex)" is required to define FLEX_TARGET macro
+# execute FindFLEX script by "find_package (Flex)" is required to define FLEX_TARGET macro
-
+
-# delete obsolete 3RDPARTY_FLEX_EXECUTABLE cache variable (not used anymore)
+# delete obsolete 3RDPARTY_FLEX_EXECUTABLE cache variable (not used anymore)
-unset (3RDPARTY_FLEX_EXECUTABLE CACHE)
+unset (3RDPARTY_FLEX_EXECUTABLE CACHE)
-
+
-# delete FLEX_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
+# delete FLEX_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
-# without reasonable diagnostic
+# without reasonable diagnostic
-if (NOT FLEX_EXECUTABLE OR NOT EXISTS "${FLEX_EXECUTABLE}")
+if (NOT FLEX_EXECUTABLE OR NOT EXISTS "${FLEX_EXECUTABLE}")
-  unset (FLEX_EXECUTABLE CACHE)
+  unset (FLEX_EXECUTABLE CACHE)
-endif()
+endif()
-if (NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}")
+if (NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}")
-  unset (FLEX_INCLUDE_DIR CACHE)
+  unset (FLEX_INCLUDE_DIR CACHE)
-endif()
+endif()
-
+
-# Add paths to 3rdparty subfolders containing name "flex" to CMAKE_PROGRAM_PATH and 
+# Add paths to 3rdparty subfolders containing name "flex" to CMAKE_PROGRAM_PATH and 
-# CMAKE_INCLUDE_PATH variables to make these paths searched by find_package
+# CMAKE_INCLUDE_PATH variables to make these paths searhed by find_package
-if (3RDPARTY_DIR)
+if (3RDPARTY_DIR)
-  file (GLOB FLEX_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*flex*")
+  file (GLOB FLEX_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*flex*")
-  foreach (candidate_path ${FLEX_PATHS})
+  foreach (candidate_path ${FLEX_PATHS})
-    if (IS_DIRECTORY ${candidate_path})
+    if (IS_DIRECTORY ${candidate_path})
-      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
+      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
-      list (APPEND CMAKE_INCLUDE_PATH ${candidate_path})
+      list (APPEND CMAKE_INCLUDE_PATH ${candidate_path})
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-endif()
+endif()
- 
+ 
-find_package (FLEX 2.6.4)
+find_package (FLEX 2.6.4)
-
+
-if (NOT FLEX_FOUND OR NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+if (NOT FLEX_FOUND OR NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
-  list (APPEND 3RDPARTY_NOT_INCLUDED FLEX_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED FLEX_INCLUDE_DIR)
-endif()
+endif()
-
-# remove old general version of FlexLexer
-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" "${CMAKE_SOURCE_DIR}/src/FlexLexer/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
-endif()

adm/cmake/freeimage.cmake

@@ -1,16 +1,3 @@
-#freeimage
+#freeimage
-
+
-# vcpkg processing
+THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "CSF_FreeImagePlus" "d")
-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,405 +1,384 @@
-# freetype
+# freetype
-
+
-# vcpkg processing
+if (NOT DEFINED INSTALL_FREETYPE AND BUILD_SHARED_LIBS)
-if (BUILD_USE_VCPKG)
+  set (INSTALL_FREETYPE OFF CACHE BOOL "${INSTALL_FREETYPE_DESCR}")
-  find_package (Freetype MODULE REQUIRED)
+endif()
-  set (CSF_FREETYPE Freetype::Freetype)
+
-  if (WIN32)
+if (NOT DEFINED 3RDPARTY_FREETYPE_DIR)
-    set (USED_3RDPARTY_FREETYPE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype")
-  else()
+endif()
-    set (USED_3RDPARTY_FREETYPE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+
-  endif()
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-  return()
+
-endif()
+OCCT_MAKE_COMPILER_SHORT_NAME()
-
+OCCT_MAKE_COMPILER_BITNESS()
-if (NOT DEFINED INSTALL_FREETYPE AND BUILD_SHARED_LIBS)
+
-  set (INSTALL_FREETYPE OFF CACHE BOOL "${INSTALL_FREETYPE_DESCR}")
+# specify freetype folder in connectin with 3RDPARTY_DIR
-endif()
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-
+  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_FREETYPE_DIR PATH "The directory containing freetype")
-if (NOT DEFINED 3RDPARTY_FREETYPE_DIR)
+
-  set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype")
+  if (NOT 3RDPARTY_FREETYPE_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DIR}")
-endif()
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FREETYPE FREETYPE_DIR_NAME)
-
+    if (FREETYPE_DIR_NAME)
-# include occt macros. compiler_bitness, os_wiht_bit, compiler
+      set (3RDPARTY_FREETYPE_DIR "${3RDPARTY_DIR}/${FREETYPE_DIR_NAME}" CACHE PATH "The directory containing freetype" FORCE)
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+    endif()
-
+  endif()
-OCCT_MAKE_COMPILER_SHORT_NAME()
+else()
-OCCT_MAKE_COMPILER_BITNESS()
+  #set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype" FORCE)
-
+endif()
-# specify freetype folder in connection with 3RDPARTY_DIR
+
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+# define required freetype variables
-  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_FREETYPE_DIR PATH "The directory containing freetype")
+if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
-
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "" CACHE FILEPATH "the path of ft2build.h")
-  if (NOT 3RDPARTY_FREETYPE_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DIR}")
+endif()
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FREETYPE FREETYPE_DIR_NAME)
+
-    if (FREETYPE_DIR_NAME)
+if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
-      set (3RDPARTY_FREETYPE_DIR "${3RDPARTY_DIR}/${FREETYPE_DIR_NAME}" CACHE PATH "The directory containing freetype" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "the path of freetype2")
-    endif()
+endif()
-  endif()
+
-else()
+if (BUILD_SHARED_LIBS)
-  #set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype" FORCE)
+  if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY OR NOT 3RDPARTY_FREETYPE_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-endif()
+    set (3RDPARTY_FREETYPE_LIBRARY               "" CACHE FILEPATH "freetype library" FORCE)
-
+  endif()
-# define required freetype variables
+
-if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+  if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY_DIR)
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "" CACHE FILEPATH "the path of ft2build.h")
+    set (3RDPARTY_FREETYPE_LIBRARY_DIR           "" CACHE PATH "The directory containing freetype library")
-endif()
+  endif()
-
+
-if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
+  if (WIN32)
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "the path of freetype2")
+    if (NOT DEFINED 3RDPARTY_FREETYPE_DLL OR NOT 3RDPARTY_FREETYPE_DLL_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
-endif()
+      set (3RDPARTY_FREETYPE_DLL                 "" CACHE FILEPATH "freetype shared library" FORCE)
-
+    endif()
-if (BUILD_SHARED_LIBS)
+  endif()
-  if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY OR NOT 3RDPARTY_FREETYPE_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
+
-    set (3RDPARTY_FREETYPE_LIBRARY               "" CACHE FILEPATH "freetype library" FORCE)
+  if (WIN32)
-  endif()
+    if (NOT DEFINED 3RDPARTY_FREETYPE_DLL_DIR)
-
+      set (3RDPARTY_FREETYPE_DLL_DIR               "" CACHE PATH "The directory containing freetype shared library")
-  if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY_DIR)
+    endif()
-    set (3RDPARTY_FREETYPE_LIBRARY_DIR           "" CACHE PATH "The directory containing freetype library")
+  endif()
-  endif()
+endif()
-
+
-  if (WIN32)
+# check 3RDPARTY_FREETYPE_ paths for consistency with specified 3RDPARTY_FREETYPE_DIR
-    if (NOT DEFINED 3RDPARTY_FREETYPE_DLL OR NOT 3RDPARTY_FREETYPE_DLL_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
+if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-      set (3RDPARTY_FREETYPE_DLL                 "" CACHE FILEPATH "freetype shared library" FORCE)
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
-    endif()
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
-  endif()
+  if (BUILD_SHARED_LIBS)
-
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY FILEPATH "the path to freetype library")
-  if (WIN32)
+
-    if (NOT DEFINED 3RDPARTY_FREETYPE_DLL_DIR)
+    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-      set (3RDPARTY_FREETYPE_DLL_DIR               "" CACHE PATH "The directory containing freetype shared library")
+      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-    endif()
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-  endif()
+    else()
-endif()
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY_DIR PATH "The directory containing freetype library")
-
+    endif()
-# check 3RDPARTY_FREETYPE_ paths for consistency with specified 3RDPARTY_FREETYPE_DIR
+
-if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+    if (WIN32)
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL FILEPATH "the path to freetype shared library")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
+
-  if (BUILD_SHARED_LIBS)
+      if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY FILEPATH "the path to freetype library")
+        get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
-
+        set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype shared library" FORCE)
-    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+      else()
-      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
+        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL_DIR PATH "The directory containing freetype shared library")
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
+      endif()
-    else()
+    endif()
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY_DIR PATH "The directory containing freetype library")
+  endif()
-    endif()
+endif()
-
+
-    if (WIN32)
+# the FIRST step in search for freetype library and header folders (built-in search engine)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL FILEPATH "the path to freetype shared library")
+
-
+# execute built-in search engine to seek freetype
-      if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
+set (IS_BUILTIN_SEARCH_REQUIRED OFF)
-        get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
+if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-        set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype shared library" FORCE)
+  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-      else()
+elseif (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL_DIR PATH "The directory containing freetype shared library")
+  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-      endif()
+elseif (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    endif()
+  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-  endif()
+#elseif (WIN32)
-endif()
+  #if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
-
+  #  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-# the FIRST step in search for freetype library and header folders (built-in search engine)
+  #endif()
-
+endif()
-# execute built-in search engine to seek freetype
+
-set (IS_BUILTIN_SEARCH_REQUIRED OFF)
+if (IS_BUILTIN_SEARCH_REQUIRED)
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
+  # use 3RDPARTY_FREETYPE_DIR if it is specified for freetype search
-elseif (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
+    set (CACHED_FREETYPE_DIR $ENV{FREETYPE_DIR})
-elseif (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+    set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
+  endif()
-#elseif (WIN32)
+
-  #if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
+  unset (FREETYPE_LIBRARY_RELEASE)
-  #  set (IS_BUILTIN_SEARCH_REQUIRED ON)
+  find_package(Freetype)
-  #endif()
+
-endif()
+  # Only for UNIX (not APPLE)
-
+  if ((NOT WIN32) AND (NOT APPLE))
-if (IS_BUILTIN_SEARCH_REQUIRED)
+    # To avoid linker error on Ubuntu 18.04 and others linux distributives we should
-
+    # link with freetype library, compiled as Position Independent Code (PIC),
-  # use 3RDPARTY_FREETYPE_DIR if it is specified for freetype search
+    # for example, with shared object.
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+    if ((DEFINED FREETYPE_LIBRARY_RELEASE) AND (NOT "${FREETYPE_LIBRARY_RELEASE}" STREQUAL "") AND (EXISTS "${FREETYPE_LIBRARY_RELEASE}"))
-    set (CACHED_FREETYPE_DIR $ENV{FREETYPE_DIR})
+      string (REPLACE "\.a" "\.so" FREETYPE_LIBRARY_RELEASE "${FREETYPE_LIBRARY_RELEASE}")
-    set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
+    endif()
-  endif()
+  endif()
-
+
-  unset (FREETYPE_LIBRARY_RELEASE)
+  # restore ENV{FREETYPE_DIR}
-  find_package(Freetype)
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-
+    set (ENV{FREETYPE_DIR} ${CACHED_FREETYPE_DIR})
-  # Only for UNIX (not APPLE)
+  endif()
-  if ((NOT WIN32) AND (NOT APPLE))
+
-    # To avoid linker error on Ubuntu 18.04 and others linux distributives we should
+  # check the found paths for consistency with specified 3RDPARTY_FREETYPE_DIR
-    # link with freetype library, compiled as Position Independent Code (PIC),
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    # for example, with shared object.
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
-    if ((DEFINED FREETYPE_LIBRARY_RELEASE) AND (NOT "${FREETYPE_LIBRARY_RELEASE}" STREQUAL "") AND (EXISTS "${FREETYPE_LIBRARY_RELEASE}"))
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
-      string (REPLACE "\.a" "\.so" FREETYPE_LIBRARY_RELEASE "${FREETYPE_LIBRARY_RELEASE}")
+    if (BUILD_SHARED_LIBS)
-    endif()
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY_RELEASE FILEPATH "freetype library")
-  endif()
+    endif()
-
+  endif()
-  # restore ENV{FREETYPE_DIR}
+
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+  # assign the found paths to corresponding 3RDPARTY_FREETYPE_ variables
-    set (ENV{FREETYPE_DIR} ${CACHED_FREETYPE_DIR})
+  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-  endif()
+    if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
-
+      set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
-  # check the found paths for consistency with specified 3RDPARTY_FREETYPE_DIR
+    endif()
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+  endif()
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
+
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
+  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-    if (BUILD_SHARED_LIBS)
+    if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY_RELEASE FILEPATH "freetype library")
+      set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2  "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # assign the found paths to corresponding 3RDPARTY_FREETYPE_ variables
+  if (BUILD_SHARED_LIBS)
-  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+    if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
+      if (FREETYPE_LIBRARY_RELEASE AND EXISTS "${FREETYPE_LIBRARY_RELEASE}")
-      set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+        set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY_RELEASE}" CACHE FILEPATH "The path to freetype library" FORCE)
-    endif()
+      endif()
-  endif()
+    endif()
-
+
-  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
+      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-      set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2  "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-    endif()
+    else()
-  endif()
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
-
+    endif()
-  if (BUILD_SHARED_LIBS)
+  endif()
-    if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+endif()
-      if (FREETYPE_LIBRARY_RELEASE AND EXISTS "${FREETYPE_LIBRARY_RELEASE}")
+
-        set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY_RELEASE}" CACHE FILEPATH "The path to freetype library" FORCE)
+# the SECOND step in search for freetype library and header folders (additional search algorithms)
-      endif()
+
-    endif()
+# ft2build.h
-
+if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+  set (FT2BUILD_NAMES ft2build.h config/ft2build.h freetype/config/ft2build.h)
-      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
+
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
+  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build
-    else()
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
+
-    endif()
+  # cmake (version < 3.0) doesn't find ft2build.h of freetype (version is >= 2.5.1)
-  endif()
+  # do search taking into account freetype structure of 2.5.1 version
-
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-  # In case of MinGW some libraries can have .dll.a extension, so we should check it and use instead of .a
+    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
-  if (MINGW AND 3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+                                                      PATHS ${3RDPARTY_FREETYPE_DIR}
-    string (REPLACE ".a" ".dll.a" 3RDPARTY_FREETYPE_LIBRARY_TEST "${3RDPARTY_FREETYPE_LIBRARY}")
+                                                      PATH_SUFFIXES include freetype2 include/freetype2
-    if (EXISTS "${3RDPARTY_FREETYPE_LIBRARY_TEST}")
+                                                      CMAKE_FIND_ROOT_PATH_BOTH
-      set (3RDPARTY_FREETYPE_LIBRARY "${3RDPARTY_FREETYPE_LIBRARY_TEST}" CACHE FILEPATH "The path to freetype library" FORCE)
+                                                      NO_DEFAULT_PATH)
-    endif()
+  else()
-  endif()
+    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
-endif()
+                                                      PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
-
+                                                      PATH_SUFFIXES include/freetype2 include freetype2
-# the SECOND step in search for freetype library and header folders (additional search algorithms)
+                                                      CMAKE_FIND_ROOT_PATH_BOTH)
-
+  endif()
-# ft2build.h
+endif()
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+
-  set (FT2BUILD_NAMES ft2build.h config/ft2build.h freetype/config/ft2build.h)
+if (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build
+else()
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
-
+
-  # cmake (version < 3.0) doesn't find ft2build.h of freetype (version is >= 2.5.1)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
-  # do search taking into account freetype structure of 2.5.1 version
+endif()
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
+# ftheader.h
-                                                      PATHS ${3RDPARTY_FREETYPE_DIR}
+if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-                                                      PATH_SUFFIXES include freetype2 include/freetype2
+  set (FTHEADER_NAMES ftheader.h config/ftheader.h freetype/config/ftheader.h)
-                                                      CMAKE_FIND_ROOT_PATH_BOTH
+
-                                                      NO_DEFAULT_PATH)
+  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2
-  else()
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
+
-                                                      PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-                                                      PATH_SUFFIXES include/freetype2 include freetype2
+    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
-                                                      CMAKE_FIND_ROOT_PATH_BOTH)
+                                                       HINTS ${3RDPARTY_FREETYPE_DIR}
-  endif()
+                                                       PATH_SUFFIXES include/freetype2 include freetype2
-endif()
+                                                       CMAKE_FIND_ROOT_PATH_BOTH
-
+                                                       NO_DEFAULT_PATH)
-if (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+  else()
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
-else()
+                                                       PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+                                                       PATH_SUFFIXES include/freetype2 include freetype2
-
+                                                       CMAKE_FIND_ROOT_PATH_BOTH)
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+  endif()
-endif()
+endif()
-
+
-# ftheader.h
+if (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-  set (FTHEADER_NAMES ftheader.h config/ftheader.h freetype/config/ftheader.h)
+else()
-
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
-  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2
+
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
-
+endif()
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
+# freetype library
-                                                       HINTS ${3RDPARTY_FREETYPE_DIR}
+#if (BUILD_SHARED_LIBS)
-                                                       PATH_SUFFIXES include/freetype2 include freetype2
+  if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-                                                       CMAKE_FIND_ROOT_PATH_BOTH
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
-                                                       NO_DEFAULT_PATH)
+
-  else()
+    set (FREETYPE_PATH_SUFFIXES lib)
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
+    if (ANDROID)
-                                                       PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
+      set (FREETYPE_PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES} libs/${ANDROID_ABI})
-                                                       PATH_SUFFIXES include/freetype2 include freetype2
+    endif()
-                                                       CMAKE_FIND_ROOT_PATH_BOTH)
+
-  endif()
+    # set 3RDPARTY_FREETYPE_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_LIBRARY
-endif()
+    set (3RDPARTY_FREETYPE_LIBRARY "3RDPARTY_FREETYPE_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to freetype library" FORCE)
-
+
-if (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+    if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+      find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
-else()
+                                              PATHS "${3RDPARTY_FREETYPE_LIBRARY_DIR}" "${3RDPARTY_FREETYPE_DIR}"
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
+                                              PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
-
+                                              CMAKE_FIND_ROOT_PATH_BOTH
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+                                              NO_DEFAULT_PATH)
-endif()
+    else()
-
+      find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
-# freetype library
+                                              PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
-#if (BUILD_SHARED_LIBS)
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
-  if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+    endif()
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
+
-
+    # Only for UNIX (not APPLE)
-    set (FREETYPE_PATH_SUFFIXES lib)
+    if ((NOT WIN32) AND (NOT APPLE))
-    if (ANDROID)
+      # To avoid linker error on Ubuntu 18.04 and some others linux distributives we should
-      set (FREETYPE_PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES} libs/${ANDROID_ABI})
+      # link with freetype library, compiled as Position Independent Code (PIC),
-    endif()
+      # for example, with shared object.
-
+      if ((DEFINED 3RDPARTY_FREETYPE_LIBRARY) AND (NOT "${3RDPARTY_FREETYPE_LIBRARY}" STREQUAL "") AND (EXISTS "${3RDPARTY_FREETYPE_LIBRARY}"))
-    # set 3RDPARTY_FREETYPE_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_LIBRARY
+        string (REPLACE "\.a" "\.so" 3RDPARTY_FREETYPE_LIBRARY "${3RDPARTY_FREETYPE_LIBRARY}")
-    set (3RDPARTY_FREETYPE_LIBRARY "3RDPARTY_FREETYPE_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to freetype library" FORCE)
+      endif()
-
+    endif()
-    if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+
-      find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
+    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-                                              PATHS "${3RDPARTY_FREETYPE_LIBRARY_DIR}" "${3RDPARTY_FREETYPE_DIR}"
+      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-                                              PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-                                              CMAKE_FIND_ROOT_PATH_BOTH
+    else()
-                                              NO_DEFAULT_PATH)
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
-    else()
+    endif()
-      find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
+  endif()
-                                              PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
+
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
+  if (3RDPARTY_FREETYPE_LIBRARY_DIR AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-    endif()
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-
+  else()
-    # Only for UNIX (not APPLE)
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FREETYPE_LIBRARY_DIR)
-    if ((NOT WIN32) AND (NOT APPLE))
+
-      # To avoid linker error on Ubuntu 18.04 and some others linux distributives we should
+    set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
-      # link with freetype library, compiled as Position Independent Code (PIC),
+  endif()
-      # for example, with shared object.
+
-      if ((DEFINED 3RDPARTY_FREETYPE_LIBRARY) AND (NOT "${3RDPARTY_FREETYPE_LIBRARY}" STREQUAL "") AND (EXISTS "${3RDPARTY_FREETYPE_LIBRARY}"))
+  # freetype shared library
-        string (REPLACE "\.a" "\.so" 3RDPARTY_FREETYPE_LIBRARY "${3RDPARTY_FREETYPE_LIBRARY}")
+  if (WIN32)
-      endif()
+    if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
-    endif()
+
-
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+
-      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
+      # set 3RDPARTY_FREETYPE_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_DLL
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
+      set (3RDPARTY_FREETYPE_DLL "3RDPARTY_FREETYPE_DLL-NOTFOUND" CACHE FILEPATH "The path to freetype shared library" FORCE)
-    else()
+
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
+      if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    endif()
+        find_library (3RDPARTY_FREETYPE_DLL ${CSF_FREETYPE}
-  endif()
+                                            PATHS "${3RDPARTY_FREETYPE_DIR}"
-
+                                            PATH_SUFFIXES bin
-  if (3RDPARTY_FREETYPE_LIBRARY_DIR AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
+                                            NO_DEFAULT_PATH)
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
+      else()
-  else()
+        find_library (3RDPARTY_FREETYPE_DLL ${CSF_FREETYPE}
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FREETYPE_LIBRARY_DIR)
+                                            PATH_SUFFIXES bin)
-
+      endif()
-    set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
+
-  endif()
+      if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
-
+        get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
-  # freetype shared library
+        set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-  if (WIN32)
+      else()
-    if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
+        set (3RDPARTY_FREETYPE_DLL_DIR "" CACHE PATH "The directory containing freetype shared library" FORCE)
-
+
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+        set (3RDPARTY_FREETYPE_DLL "" CACHE FILEPATH "freetype shared library" FORCE)
-
+      endif()
-      # set 3RDPARTY_FREETYPE_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_DLL
+    endif()
-      set (3RDPARTY_FREETYPE_DLL "3RDPARTY_FREETYPE_DLL-NOTFOUND" CACHE FILEPATH "The path to freetype shared library" FORCE)
+
-
+    if (3RDPARTY_FREETYPE_DLL_DIR OR EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
-      if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
-        find_library (3RDPARTY_FREETYPE_DLL ${CSF_FREETYPE}
+    else()
-                                            PATHS "${3RDPARTY_FREETYPE_DIR}"
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FREETYPE_DLL_DIR)
-                                            PATH_SUFFIXES bin
+    endif()
-                                            NO_DEFAULT_PATH)
+  endif()
-      else()
+
-        find_library (3RDPARTY_FREETYPE_DLL ${CSF_FREETYPE}
+  # install instructions
-                                            PATH_SUFFIXES bin)
+  if (INSTALL_FREETYPE)
-      endif()
+    OCCT_MAKE_OS_WITH_BITNESS()
-
+
-      if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
+    if (WIN32)
-        get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
+      if (SINGLE_GENERATOR)
-        set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
+        install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_DIR_BIN}")
-      else()
+      else()
-        set (3RDPARTY_FREETYPE_DLL_DIR "" CACHE PATH "The directory containing freetype shared library" FORCE)
+        install (FILES "${3RDPARTY_FREETYPE_DLL}"
-
+                 CONFIGURATIONS Release
-        set (3RDPARTY_FREETYPE_DLL "" CACHE FILEPATH "freetype shared library" FORCE)
+                 DESTINATION "${INSTALL_DIR_BIN}")
-      endif()
+        install (FILES "${3RDPARTY_FREETYPE_DLL}"
-    endif()
+                 CONFIGURATIONS RelWithDebInfo
-
+                 DESTINATION "${INSTALL_DIR_BIN}i")
-    if (3RDPARTY_FREETYPE_DLL_DIR OR EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
+        install (FILES "${3RDPARTY_FREETYPE_DLL}"
-      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
+                 CONFIGURATIONS Debug
-    else()
+                 DESTINATION "${INSTALL_DIR_BIN}d")
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FREETYPE_DLL_DIR)
+      endif()
-    endif()
+    else()
-  endif()
+      get_filename_component(3RDPARTY_FREETYPE_LIBRARY_ABS ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
-
+      get_filename_component(3RDPARTY_FREETYPE_LIBRARY_NAME ${3RDPARTY_FREETYPE_LIBRARY} NAME)
-  # install instructions
+
-  if (INSTALL_FREETYPE)
+      if (SINGLE_GENERATOR)
-    OCCT_MAKE_OS_WITH_BITNESS()
+        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-
+                 DESTINATION "${INSTALL_DIR_LIB}"
-    if (WIN32)
+                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-      if (SINGLE_GENERATOR)
+      else()
-        install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_DIR_BIN}")
+        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-      else()
+                 CONFIGURATIONS Release
-        install (FILES "${3RDPARTY_FREETYPE_DLL}"
+                 DESTINATION "${INSTALL_DIR_LIB}"
-                 CONFIGURATIONS Release
+                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-                 DESTINATION "${INSTALL_DIR_BIN}")
+        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-        install (FILES "${3RDPARTY_FREETYPE_DLL}"
+                 CONFIGURATIONS RelWithDebInfo
-                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR_LIB}i"
-                 DESTINATION "${INSTALL_DIR_BIN}i")
+                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-        install (FILES "${3RDPARTY_FREETYPE_DLL}"
+        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_LIB}d"
-      endif()
+                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-    else()
+      endif()
-      get_filename_component(3RDPARTY_FREETYPE_LIBRARY_ABS ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
+    endif()
-      get_filename_component(3RDPARTY_FREETYPE_LIBRARY_NAME ${3RDPARTY_FREETYPE_LIBRARY} NAME)
+
-
+    set (USED_3RDPARTY_FREETYPE_DIR "")
-      if (SINGLE_GENERATOR)
+  else()
-        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+    # the library directory for using by the executable
-                 DESTINATION "${INSTALL_DIR_LIB}"
+    if (WIN32)
-                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_DLL_DIR})
-      else()
+    else()
-        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
-                 CONFIGURATIONS Release
+    endif()
-                 DESTINATION "${INSTALL_DIR_LIB}"
+  endif()
-                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+#endif()
-        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+
-                 CONFIGURATIONS RelWithDebInfo
+# unset all redundant variables
-                 DESTINATION "${INSTALL_DIR_LIB}i"
+OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
-                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_freetype2)
-        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY_RELEASE)
-                 CONFIGURATIONS Debug
+
-                 DESTINATION "${INSTALL_DIR_LIB}d"
+if (BUILD_SHARED_LIBS)
-                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+  mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)
-      endif()
+else()
-    endif()
+  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_DLL)
-
+  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_DLL_DIR)
-    set (USED_3RDPARTY_FREETYPE_DIR "")
+  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_LIBRARY)
-  else()
+  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_LIBRARY_DIR)
-    # the library directory for using by the executable
+  OCCT_CHECK_AND_UNSET(INSTALL_FREETYPE)
-    if (WIN32)
+endif()
-      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_DLL_DIR})
-    else()
-      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
-    endif()
-  endif()
-#endif()
-
-# 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)
-else()
-  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_DLL)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_DLL_DIR)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_LIBRARY)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_LIBRARY_DIR)
-  OCCT_CHECK_AND_UNSET(INSTALL_FREETYPE)
-endif()

adm/cmake/gles2.cmake

@@ -1,3 +1,3 @@
-# OpenGL ES 2.0
+# OpenGL ES 2.0
-
+
-THIRDPARTY_PRODUCT("GLES2" "GLES2/gl2.h" "CSF_OpenGlesLibs" "")
+THIRDPARTY_PRODUCT("GLES2" "GLES2/gl2.h" "CSF_OpenGlesLibs" "")

adm/cmake/glx.cmake

@@ -1,4 +1,4 @@
-# glx
+# glx
-
+
-separate_arguments (CSF_OpenGlLibs)
+separate_arguments (CSF_OpenGlLibs)
-THIRDPARTY_PRODUCT("GLX" "GL/glx.h" "CSF_OpenGlLibs" "d")
+THIRDPARTY_PRODUCT("GLX" "GL/glx.h" "CSF_OpenGlLibs" "d")

adm/cmake/jemalloc.cmake

@@ -1,170 +0,0 @@
-# JeMalloc
-
-function (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
-  if (NOT 3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB})
-    set (JEMALLOC_PATH_SUFFIXES "lib" "bin")
-    set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}-NOTFOUND")
-    if (3RDPARTY_JEMALLOC_DIR AND EXISTS "${3RDPARTY_JEMALLOC_DIR}")
-      find_library (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} NAMES ${MMGR_LIB}
-                    PATHS "${3RDPARTY_JEMALLOC_LIBRARY_DIR}" "${3RDPARTY_JEMALLOC_DIR}"
-                    PATH_SUFFIXES ${JEMALLOC_PATH_SUFFIXES}
-                    CMAKE_FIND_ROOT_PATH_BOTH
-                    NO_DEFAULT_PATH)
-    else()
-      find_library (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} NAMES ${MMGR_LIB}
-                    PATH_SUFFIXES ${JEMALLOC_PATH_SUFFIXES}
-                    CMAKE_FIND_ROOT_PATH_BOTH)
-    endif()
-    if (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB})
-      get_filename_component (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} "${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}}" PATH)
-      set (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}")
-    else()
-      set (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} "")
-    endif()
-  endif()
-  if (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB})
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}" PARENT_SCOPE)
-    set (3RDPARTY_JEMALLOC_LIBRARY_DIR "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}" CACHE PATH "The directory containing JEMALLOC libraries" FORCE)
-  elseif("${PREFIX}" STREQUAL "SHARED")
-    return()
-  else()
-    message(STATUS "Cannot find ${MMGR_LIB} library in jemalloc 3rdparty")
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} PARENT_SCOPE)
-    set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "" PARENT_SCOPE)
-  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)
-  endif()
-  # install instructions
-  if (INSTALL_JEMALLOC AND NOT JEMALLOC_IS_STATIC_LIB)
-    OCCT_MAKE_OS_WITH_BITNESS()
-    OCCT_MAKE_COMPILER_SHORT_NAME()
-    get_filename_component(3RDPARTY_JEMALLOC_LIBRARY ${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} REALPATH)
-    if (SINGLE_GENERATOR)
-      install (FILES "${3RDPARTY_JEMALLOC_LIBRARY}"
-               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
-    else()
-        install (FILES "${3RDPARTY_JEMALLOC_LIBRARY}"
-               CONFIGURATIONS Debug
-               DESTINATION "${JEMALLOC_INSTALL_DESTINATION}d")
-        install (FILES "${3RDPARTY_JEMALLOC_LIBRARY}"
-                 CONFIGURATIONS Release
-                 DESTINATION "${JEMALLOC_INSTALL_DESTINATION}")
-        install (FILES "${3RDPARTY_JEMALLOC_LIBRARY}"
-                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${JEMALLOC_INSTALL_DESTINATION}i")
-    endif()
-    set (USED_3RDPARTY_JEMALLOC_DIR "" PARENT_SCOPE)
-  elseif(NOT JEMALLOC_IS_STATIC_LIB)
-    # the library directory for using by the executable
-    set (USED_3RDPARTY_JEMALLOC_DIR ${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}} PARENT_SCOPE)
-  endif()
-  unset(3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} CACHE)
-  unset(3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} CACHE)
-endfunction()
-
-macro (SEARCH_JEMALLOC)
-  # find static jemalloc lib
-  SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".lib" ".a")
-  if (WIN32)
-    JEMALLOC_LIB_SEARCH ("jemalloc" "STATIC")
-  elseif(NOT WIN32)
-    JEMALLOC_LIB_SEARCH ("jemalloc_pic" "STATIC")
-    SET(CMAKE_FIND_LIBRARY_SUFFIXES "" "so")
-    JEMALLOC_LIB_SEARCH ("jemalloc.so.2" "SHARED")
-  endif()
-  
-  # find shared jemalloc lib
-  SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".so")
-  JEMALLOC_LIB_SEARCH ("jemalloc" "SHARED")
-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()
-
-# include occt macros. compiler_bitness, os_with_bit, compiler
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
-# specify JEMALLOC folder in connection with 3RDPARTY_DIR
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_JEMALLOC_DIR OR NOT EXISTS "${3RDPARTY_JEMALLOC_DIR}")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" jemalloc JEMALLOC_DIR_NAME)
-    if (JEMALLOC_DIR_NAME)
-      set (3RDPARTY_JEMALLOC_DIR "${3RDPARTY_DIR}/${JEMALLOC_DIR_NAME}" CACHE PATH "The directory containing JEMALLOC" FORCE)
-      set (3RDPARTY_JEMALLOC_DIR "${3RDPARTY_DIR}/${JEMALLOC_DIR_NAME}")
-      message(STATUS "Info: JEMALLOC detected in ${3RDPARTY_JEMALLOC_DIR}")
-    endif()
-  endif()
-  else()
-endif()
-
-# define required JEMALLOC variables
-if (NOT DEFINED 3RDPARTY_JEMALLOC_INCLUDE_DIR)
-  set (3RDPARTY_JEMALLOC_INCLUDE_DIR  "" CACHE PATH "the path of headers directory")
-endif()
-
-# check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
-if (3RDPARTY_JEMALLOC_DIR AND EXISTS "${3RDPARTY_JEMALLOC_DIR}")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_JEMALLOC_DIR 3RDPARTY_JEMALLOC_INCLUDE_DIR PATH "the path to JEMALLOC")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_JEMALLOC_DIR 3RDPARTY_JEMALLOC_LIBRARY_DIR FILEPATH "The directory containing JEMALLOC libraries")
-endif()
-
-# header
-if (NOT 3RDPARTY_JEMALLOC_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_JEMALLOC_INCLUDE_DIR}")
-  set (HEADER_NAMES jemalloc.h)
-  
-  # set 3RDPARTY_JEMALLOC_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_JEMALLOC_INCLUDE_DIR
-  set (3RDPARTY_JEMALLOC_INCLUDE_DIR "3RDPARTY_JEMALLOC_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to header directory" FORCE)
-  
-  if (3RDPARTY_JEMALLOC_DIR AND EXISTS "${3RDPARTY_JEMALLOC_DIR}")
-    find_path (3RDPARTY_JEMALLOC_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                               PATHS ${3RDPARTY_JEMALLOC_DIR}
-                                               PATH_SUFFIXES include/jemalloc
-                                               CMAKE_FIND_ROOT_PATH_BOTH
-                                               NO_DEFAULT_PATH)
-  else()
-    find_path (3RDPARTY_JEMALLOC_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                               PATHS ${3RDPARTY_JEMALLOC_DIR}
-                                               PATH_SUFFIXES include/jemalloc
-                                               CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-endif()
-
-if (3RDPARTY_JEMALLOC_INCLUDE_DIR AND EXISTS "${3RDPARTY_JEMALLOC_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_JEMALLOC_INCLUDE_DIR}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_JEMALLOC_INCLUDE_DIR)
-  set (3RDPARTY_JEMALLOC_INCLUDE_DIR "" CACHE FILEPATH "the path to jemalloc.h" FORCE)
-endif()
-
-# Installing destination path
-if (WIN32)
-  set (JEMALLOC_INSTALL_DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
-else()
-  set (JEMALLOC_INSTALL_DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
-endif()
-
-# find static jemalloc lib
-SEARCH_JEMALLOC()

adm/cmake/occt_csf.cmake

@@ -1,150 +1,150 @@
-# CSF variables definition
+# CSF variables definition
-
+
-if(CSFS_ALREADY_INCLUDED)
+if(CSFS_ALREADY_INCLUDED)
-  return()
+  return()
-endif()
+endif()
-set(CSFS_ALREADY_INCLUDED 1)
+set(CSFS_ALREADY_INCLUDED 1)
-
+
-
+
-if (NOT DEFINED USE_TCL)
+if (NOT DEFINED USE_TCL)
-  OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
+  OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
-endif()
+endif()
-
+
-# TBB
+# TBB
-if (USE_TBB)
+if (USE_TBB)
-  set (CSF_TBB "tbb tbbmalloc")
+  set (CSF_TBB "tbb tbbmalloc")
-else()
+else()
-  set (CSF_TBB)
+  set (CSF_TBB)
-endif()
+endif()
-
+
-# FREETYPE
+# FREETYPE
-if (USE_FREETYPE)
+if (USE_FREETYPE)
-  set (CSF_FREETYPE "freetype")
+  set (CSF_FREETYPE "freetype")
-else()
+else()
-  set (CSF_FREETYPE)
+  set (CSF_FREETYPE)
-endif()
+endif()
-
+
-# FFmpeg
+# FFmpeg
-if (USE_FFMPEG)
+if (USE_FFMPEG)
-  set (CSF_FFmpeg "avcodec avformat swscale avutil")
+  set (CSF_FFmpeg "avcodec avformat swscale avutil")
-else()
+else()
-  set (CSF_FFmpeg)
+  set (CSF_FFmpeg)
-endif()
+endif()
-
+
-# FREEIMAGE
+# FREEIMAGE
-if (USE_FREEIMAGE)
+if (USE_FREEIMAGE)
-  set (CSF_FreeImagePlus "freeimage")
+  set (CSF_FreeImagePlus "freeimage")
-else()
+else()
-  if (WIN32)
+  if (WIN32)
-    set (CSF_FreeImagePlus "windowscodecs")
+    set (CSF_FreeImagePlus "windowscodecs")
-  else()
+  else()
-    set (CSF_FreeImagePlus)
+    set (CSF_FreeImagePlus)
-  endif()
+  endif()
-endif()
+endif()
-
+
-# OpenVR
+# OpenVR
-if (USE_OPENVR)
+if (USE_OPENVR)
-  set (CSF_OpenVR "openvr_api")
+  set (CSF_OpenVR "openvr_api")
-else()
+else()
-  set (CSF_OpenVR)
+  set (CSF_OpenVR)
-endif()
+endif()
-
+
-# TCL
+# TCL
-if (USE_TCL)
+if (USE_TCL)
-  if (WIN32)
+  if (WIN32)
-    set (CSF_TclLibs     "tcl86")
+    set (CSF_TclLibs     "tcl86")
-  else()
+  else()
-    if(APPLE)
+    if(APPLE)
-      set (CSF_TclLibs   Tcl)
+      set (CSF_TclLibs   Tcl)
-    elseif(UNIX)
+    elseif(UNIX)
-      set (CSF_TclLibs   "tcl8.6")
+      set (CSF_TclLibs   "tcl8.6")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# TK
+# TK
-if (USE_TK)
+if (USE_TK)
-  if (WIN32)
+  if (WIN32)
-    set (CSF_TclTkLibs   "tk86")
+    set (CSF_TclTkLibs   "tk86")
-  else()
+  else()
-    if(APPLE)
+    if(APPLE)
-      set (CSF_TclTkLibs Tk)
+      set (CSF_TclTkLibs Tk)
-    elseif(UNIX)
+    elseif(UNIX)
-      set (CSF_TclTkLibs "tk8.6")
+      set (CSF_TclTkLibs "tk8.6")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# Draco
+# Draco
-if (USE_DRACO)
+if (USE_DRACO)
-  set (CSF_Draco "draco")
+  set (CSF_Draco "draco")
-else()
+else()
-  set (CSF_Draco)
+  set (CSF_Draco)
-endif()
+endif()
-
+
-if (WIN32)
+if (WIN32)
-  set (CSF_advapi32      "advapi32.lib")
+  set (CSF_advapi32      "advapi32.lib")
-  set (CSF_gdi32         "gdi32.lib")
+  set (CSF_gdi32         "gdi32.lib")
-  set (CSF_user32        "user32.lib")
+  set (CSF_user32        "user32.lib")
-  set (CSF_shell32       "shell32.lib")
+  set (CSF_shell32       "shell32.lib")
-  set (CSF_wsock32       "wsock32.lib")
+  set (CSF_wsock32       "wsock32.lib")
-  set (CSF_psapi         "psapi.lib")
+  set (CSF_psapi         "psapi.lib")
-  set (CSF_winmm         "winmm.lib")
+  set (CSF_winmm         "winmm.lib")
-  set (CSF_d3d9          "D3D9.lib")
+  set (CSF_d3d9          "D3D9.lib")
-  set (CSF_OpenGlLibs    "opengl32.lib")
+  set (CSF_OpenGlLibs    "opengl32.lib")
-  set (CSF_OpenGlesLibs  "libEGL libGLESv2")
+  set (CSF_OpenGlesLibs  "libEGL libGLESv2")
-else()
+else()
-
+
-  if (APPLE)
+  if (APPLE)
-    set (CSF_objc        "objc")
+    set (CSF_objc        "objc")
-
+
-    # frameworks
+    # frameworks
-    if (IOS)
+    if (IOS)
-      find_library (Appkit_LIB NAMES UIKit)
+      find_library (Appkit_LIB NAMES UIKit)
-      set (CSF_Appkit ${Appkit_LIB})
+      set (CSF_Appkit ${Appkit_LIB})
-    else()
+    else()
-      find_library (Appkit_LIB NAMES AppKit)
+      find_library (Appkit_LIB NAMES AppKit)
-      set (CSF_Appkit ${Appkit_LIB})
+      set (CSF_Appkit ${Appkit_LIB})
-    endif()
+    endif()
-    OCCT_CHECK_AND_UNSET (Appkit_LIB)
+    OCCT_CHECK_AND_UNSET (Appkit_LIB)
-
+
-    find_library (IOKit_LIB NAMES IOKit)
+    find_library (IOKit_LIB NAMES IOKit)
-    set (CSF_IOKit ${IOKit_LIB})
+    set (CSF_IOKit ${IOKit_LIB})
-    OCCT_CHECK_AND_UNSET (IOKit_LIB)
+    OCCT_CHECK_AND_UNSET (IOKit_LIB)
-
+
-    if (IOS)
+    if (IOS)
-      find_library (OpenGlesLibs_LIB NAMES OpenGLES)
+      find_library (OpenGlesLibs_LIB NAMES OpenGLES)
-      set (CSF_OpenGlesLibs ${OpenGlesLibs_LIB})
+      set (CSF_OpenGlesLibs ${OpenGlesLibs_LIB})
-      OCCT_CHECK_AND_UNSET (OpenGlesLibs_LIB)
+      OCCT_CHECK_AND_UNSET (OpenGlesLibs_LIB)
-    elseif (USE_XLIB)
+    elseif (USE_XLIB)
-      set (CSF_OpenGlLibs "GL")
+      set (CSF_OpenGlLibs "GL")
-      set (CSF_XwLibs     "X11")
+      set (CSF_XwLibs     "X11")
-    else()
+    else()
-      find_library (OpenGlLibs_LIB NAMES OpenGL)
+      find_library (OpenGlLibs_LIB NAMES OpenGL)
-      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
+      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
+      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
-    endif()
+    endif()
-
+
-  elseif (EMSCRIPTEN)
+  elseif (EMSCRIPTEN)
-    set (CSF_ThreadLibs   "pthread rt stdc++")
+    set (CSF_ThreadLibs   "pthread rt stdc++")
-    set (CSF_OpenGlesLibs "EGL GLESv2")
+    set (CSF_OpenGlesLibs "EGL GLESv2")
-    set (CSF_dl           "dl")
+    set (CSF_dl           "dl")
-  elseif (ANDROID)
+  elseif (ANDROID)
-    set (CSF_ThreadLibs  "c")
+    set (CSF_ThreadLibs  "c")
-    set (CSF_OpenGlesLibs "EGL GLESv2")
+    set (CSF_OpenGlesLibs "EGL GLESv2")
-    set (CSF_androidlog  "log")
+    set (CSF_androidlog  "log")
-  elseif (UNIX)
+  elseif (UNIX)
-    set (CSF_ThreadLibs  "pthread rt stdc++")
+    set (CSF_ThreadLibs  "pthread rt stdc++")
-    if (USE_XLIB)
+    if (USE_XLIB)
-      set (CSF_OpenGlLibs "GL")
+      set (CSF_OpenGlLibs "GL")
-      set (CSF_XwLibs     "X11")
+      set (CSF_XwLibs     "X11")
-    else()
+    else()
-      set (CSF_OpenGlLibs "GL EGL")
+      set (CSF_OpenGlLibs "GL EGL")
-    endif()
+    endif()
-    set (CSF_OpenGlesLibs "EGL GLESv2")
+    set (CSF_OpenGlesLibs "EGL GLESv2")
-    set (CSF_dl          "dl")
+    set (CSF_dl          "dl")
-    if (USE_FREETYPE)
+    if (USE_FREETYPE)
-      set (CSF_fontconfig "fontconfig")
+      set (CSF_fontconfig "fontconfig")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()

adm/cmake/occt_defs_flags.cmake

@@ -1,208 +1,159 @@
-##
+##
-
+
-if(FLAGS_ALREADY_INCLUDED)
+if(FLAGS_ALREADY_INCLUDED)
-  return()
+  return()
-endif()
+endif()
-set(FLAGS_ALREADY_INCLUDED 1)
+set(FLAGS_ALREADY_INCLUDED 1)
-
+
-# force option /fp:precise for Visual Studio projects.
+# force option /fp:precise for Visual Studio projects.
-#
+#
-# Note that while this option is default for MSVC compiler, Visual Studio
+# Note that while this option is default for MSVC compiler, Visual Studio
-# project can be switched later to use Intel Compiler (ICC).
+# project can be switched later to use Intel Compiler (ICC).
-# Enforcing -fp:precise ensures that in such case ICC will use correct
+# Enforcing -fp:precise ensures that in such case ICC will use correct
-# option instead of its default -fp:fast which is harmful for OCCT.
+# option instead of its default -fp:fast which is harmful for OCCT.
-if (MSVC)
+if (MSVC)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise")
-  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /fp:precise")
+  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /fp:precise")
-endif()
+endif()
-
+
-# add SSE2 option for old MSVC compilers (VS 2005 - 2010, 32 bit only)
+# add SSE2 option for old MSVC compilers (VS 2005 - 2010, 32 bit only)
-if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
+if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-  if (MSVC AND ((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION EQUAL 1500) OR (MSVC_VERSION EQUAL 1600)))
+  if (MSVC AND ((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION EQUAL 1500) OR (MSVC_VERSION EQUAL 1600)))
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
-    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /arch:SSE2")
+    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /arch:SSE2")
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (MSVC)
+if (MSVC)
-  # suppress C26812 on VS2019/C++20 (prefer 'enum class' over 'enum')
+  # suppress C26812 on VS2019/C++20 (prefer 'enum class' over 'enum')
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd\"26812\"")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd\"26812\"")
-  # suppress warning on using portable non-secure functions in favor of non-portable secure ones
+  # 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)
+  add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
-else()
+else()
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fPIC")
-  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fexceptions")
+  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fexceptions -fPIC")
-  if (NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
+  add_definitions(-DOCC_CONVERT_SIGNALS)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+endif()
-    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")
+
-  else()
+# enable structured exceptions for MSVC
-   add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
+string (REGEX MATCH "EHsc" ISFLAG "${CMAKE_CXX_FLAGS}")
-  endif()
+if (ISFLAG)
-  if (APPLE)
+  string (REGEX REPLACE "EHsc" "EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+elseif (MSVC)
-    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wno-deprecated-declarations")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHa")
-  endif()
+endif()
-  add_definitions(-DOCC_CONVERT_SIGNALS)
+
-endif()
+if (MSVC)
-
+  # string pooling (GF), function-level linking (Gy)
-# enable structured exceptions for MSVC
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy")
-string (REGEX MATCH "EHsc" ISFLAG "${CMAKE_CXX_FLAGS}")
+  set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GF /Gy")
-if (ISFLAG)
+  if (BUILD_FORCE_RelWithDebInfo)
-  string (REGEX REPLACE "EHsc" "EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    # generate debug info (Zi), inline expansion level (Ob1)
-elseif (MSVC)
+    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Ob1")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHa")
+    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /Zi /Ob1")
-endif()
+    # generate debug info (debug), OptimizeReferences=true (OPT:REF), EnableCOMDATFolding=true (OPT:ICF)
-
+    set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /debug /OPT:REF /OPT:ICF")
-if (MSVC)
+  endif()
-  if ("${BUILD_OPT_PROFILE}" STREQUAL "Production")
+endif()
-    # string pooling (GF), function-level linking (Gy)
+
-    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy")
+# remove _WINDOWS flag if it exists
-    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GF /Gy")
+string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_CXX_FLAGS}")
-
+if (IS_WINDOWSFLAG)
-    # Favor fast code (Ot), Omit frame pointers (Oy)
+  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_CXX_FLAGS")
-    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ot /Oy")
+  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /Ot /Oy")
+endif()
-
+
-    # Whole Program Optimisation (GL), Enable intrinsic functions (Oi)
+# remove WIN32 flag if it exists
-    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Oi")
+string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GL /Oi")
+if (IS_WIN32FLAG)
-
+  message (STATUS "Info: /DWIN32 has been removed from CMAKE_CXX_FLAGS")
-    # Link-Time Code Generation(LTCG) is requared for Whole Program Optimisation(GL)
+  string (REGEX REPLACE "/DWIN32" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
+endif()
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
+
-    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
+# remove _WINDOWS flag if it exists
-    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
+string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_C_FLAGS}")
-  endif()
+if (IS_WINDOWSFLAG)
-  if (BUILD_FORCE_RelWithDebInfo)
+  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_C_FLAGS")
-    # generate debug info (Zi), inline expansion level (Ob1)
+  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Ob1")
+endif()
-    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /Zi /Ob1")
+
-    # generate debug info (debug), OptimizeReferences=true (OPT:REF), EnableCOMDATFolding=true (OPT:ICF)
+# remove WIN32 flag if it exists
-    set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /debug /OPT:REF /OPT:ICF")
+string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_C_FLAGS}")
-  endif()
+if (IS_WIN32FLAG)
-endif()
+  message (STATUS "Info: /DWIN32 has been removed from CMAKE_C_FLAGS")
-
+  string (REGEX REPLACE "/DWIN32" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-# remove _WINDOWS flag if it exists
+endif()
-string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_CXX_FLAGS}")
+
-if (IS_WINDOWSFLAG)
+# remove DEBUG flag if it exists
-  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_CXX_FLAGS")
+string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}")
-  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+if (IS_DEBUG_CXX)
-endif()
+  message (STATUS "Info: -DDEBUG has been removed from CMAKE_CXX_FLAGS_DEBUG")
-
+  string (REGEX REPLACE "-DDEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-# remove WIN32 flag if it exists
+endif()
-string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_CXX_FLAGS}")
+
-if (IS_WIN32FLAG)
+string (REGEX MATCH "-DDEBUG" IS_DEBUG_C "${CMAKE_C_FLAGS_DEBUG}")
-  message (STATUS "Info: /DWIN32 has been removed from CMAKE_CXX_FLAGS")
+if (IS_DEBUG_C)
-  string (REGEX REPLACE "/DWIN32" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  message (STATUS "Info: -DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
-endif()
+  string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-
+endif()
-# remove _WINDOWS flag if it exists
+# enable parallel compilation on MSVC 9 and above
-string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_C_FLAGS}")
+if (MSVC AND (MSVC_VERSION GREATER 1400))
-if (IS_WINDOWSFLAG)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_C_FLAGS")
+endif()
-  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+
-endif()
+# generate a single response file which enlist all of the object files
-
+if (NOT DEFINED CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS)
-# remove WIN32 flag if it exists
+  SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_C_FLAGS}")
+endif()
-if (IS_WIN32FLAG)
+if (NOT DEFINED CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS)
-  message (STATUS "Info: /DWIN32 has been removed from CMAKE_C_FLAGS")
+  SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-  string (REGEX REPLACE "/DWIN32" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+endif()
-endif()
+
-
+# increase compiler warnings level (-W4 for MSVC, -Wextra for GCC)
-# remove DEBUG flag if it exists
+if (MSVC)
-string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}")
+  if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-if (IS_DEBUG_CXX)
+    string (REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  message (STATUS "Info: -DDEBUG has been removed from CMAKE_CXX_FLAGS_DEBUG")
+  else()
-  string (REGEX REPLACE "-DDEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-endif()
+  endif()
-
+elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]"))
-string (REGEX MATCH "-DDEBUG" IS_DEBUG_C "${CMAKE_C_FLAGS_DEBUG}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
-if (IS_DEBUG_C)
+  if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
-  message (STATUS "Info: -DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
-  string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+  endif()
-endif()
+  if (BUILD_SHARED_LIBS)
-# enable parallel compilation on MSVC 9 and above
+    if (APPLE)
-if (MSVC AND (MSVC_VERSION GREATER 1400))
+      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+    elseif(NOT WIN32)
-endif()
+      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
-
+    endif()
-# generate a single response file which enlist all of the object files
+  endif()
-if (NOT DEFINED CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS)
+endif()
-  SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+
-endif()
+if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
-if (NOT DEFINED CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS)
+  if (APPLE)
-  SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+    # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
-endif()
+    set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
-
+  endif()
-# increase compiler warnings level (-W4 for MSVC, -Wextra for GCC)
+  # Optimize size of binaries
-if (MSVC)
+  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
-  if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+elseif(MINGW)
-    string (REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  add_definitions(-D_WIN32_WINNT=0x0601)
-  else()
+  # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+  #set (CMAKE_SYSTEM_VERSION "6.1")
-  endif()
+  # workaround bugs in mingw with vtable export
-elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]"))
+  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+
-
+  # Optimize size of binaries
-  if ("${BUILD_OPT_PROFILE}" STREQUAL "Production")
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-    # /Ot (favor speed over size) is similar to -O2 or -O3 in GCC/Clang.
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
-    # /Oy (omit frame pointers) is similar to -fomit-frame-pointer in GCC/Clang.
+elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
-    # /GL (whole program optimization) is similar to -flto (Link Time Optimization) in GCC/Clang.
+  # Optimize size of binaries
-    # /GF (eliminate duplicate strings) doesn't have a direct equivalent in GCC/Clang, but the compilers do string pooling automatically.
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-    # /Gy (enable function-level linking) is similar to -ffunction-sections in GCC/Clang.
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fomit-frame-pointer -flto -ffunction-sections")
+endif()
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -fomit-frame-pointer -flto -ffunction-sections")
+
-
+if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
-    # Link-Time Code Generation(LTCG) is requared for Whole Program Optimisation(GL)
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto")
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -flto")
+endif()
-    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} -flto")
-    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto")
-    if (NOT WIN32)
-      set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--gc-sections")
-      set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} -Wl,--gc-sections")
-      set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -Wl,--gc-sections")
-    endif()
-  endif()
-  if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
-  endif()
-  if (BUILD_SHARED_LIBS)
-    if (APPLE)
-      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
-    elseif(NOT WIN32)
-      set (CMAKE_SHARED_LINKER_FLAGS "-lm -Wl,-Bsymbolic ${CMAKE_SHARED_LINKER_FLAGS}")
-    endif()
-  endif()
-endif()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
-  if (APPLE)
-    # 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)
-  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")
-endif()
-
-if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
-endif()

adm/cmake/occt_resources.cmake

@@ -1,78 +1,78 @@
-# OCCT resource files generation
+# OCCT resource files generation
-
+
-macro (OCCT_GENERATE_CONTENT_ONLY CurrentResource)
+macro (OCCT_GENERATE_CONTENT_ONLY CurrentResource)
-  set (RESOURCE_FILES)
+  set (RESOURCE_FILES)
-  set (isResDirectory FALSE)
+  set (isResDirectory FALSE)
-  if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/src/${CurrentResource}")
+  if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/src/${CurrentResource}")
-    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource}/FILES" RESOURCE_FILES)
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource}/FILES" RESOURCE_FILES)
-    set (CurrentResource_Directory "${CurrentResource}")
+    set (CurrentResource_Directory "${CurrentResource}")
-    set (isResDirectory TRUE)
+    set (isResDirectory TRUE)
-  else()
+  else()
-    get_filename_component (CurrentResource_Name "${CurrentResource}" NAME)
+    get_filename_component (CurrentResource_Name "${CurrentResource}" NAME)
-    list (APPEND RESOURCE_FILES "res:::${CurrentResource_Name}")
+    list (APPEND RESOURCE_FILES "res:::${CurrentResource_Name}")
-    get_filename_component (CurrentResource_Directory "${CurrentResource}" DIRECTORY)
+    get_filename_component (CurrentResource_Directory "${CurrentResource}" DIRECTORY)
-  endif()
+  endif()
-
+
-  # Add current toolkit into RESOURCE_TOOLKITS array to copy it to the BUILD directory
+  # Add current toolkit into RESOURCE_TOOLKITS array to copy it to the BUILD directory
-  list (APPEND RESOURCE_TOOLKITS "${CurrentResource_Directory}")
+  list (APPEND RESOURCE_TOOLKITS "${CurrentResource_Directory}")
-  list (REMOVE_DUPLICATES RESOURCE_TOOLKITS)
+  list (REMOVE_DUPLICATES RESOURCE_TOOLKITS)
-
+
-  if (BUILD_RESOURCES)
+  if (BUILD_RESOURCES)
-    foreach (RESOURCE_FILE ${RESOURCE_FILES})
+    foreach (RESOURCE_FILE ${RESOURCE_FILES})
-      string (REGEX MATCH "^[^:]+:::" IS_RESOURCE "${RESOURCE_FILE}")
+      string (REGEX MATCH "^[^:]+:::" IS_RESOURCE "${RESOURCE_FILE}")
-      if (IS_RESOURCE)
+      if (IS_RESOURCE)
-        string (REGEX REPLACE "[^:]+:+" "" RESOURCE_FILE "${RESOURCE_FILE}")
+        string (REGEX REPLACE "[^:]+:+" "" RESOURCE_FILE "${RESOURCE_FILE}")
-
+
-        get_filename_component (CurrentResource_FileName "${RESOURCE_FILE}" NAME)
+        get_filename_component (CurrentResource_FileName "${RESOURCE_FILE}" NAME)
-        string (REPLACE "." "_" CurrentResource_FileName "${CurrentResource_FileName}")
+        string (REPLACE "." "_" CurrentResource_FileName "${CurrentResource_FileName}")
-        set (HEADER_FILE_NAME "${CurrentResource_Directory}_${CurrentResource_FileName}.pxx")
+        set (HEADER_FILE_NAME "${CurrentResource_Directory}_${CurrentResource_FileName}.pxx")
-
+
-        set (toProcessResFile TRUE)
+        set (toProcessResFile TRUE)
-        if (isResDirectory)
+        if (isResDirectory)
-          list (FIND RESOURCE_FILES "${HEADER_FILE_NAME}" aResIndex)
+          list (FIND RESOURCE_FILES "${HEADER_FILE_NAME}" aResIndex)
-          if ("${aResIndex}" STREQUAL "-1")
+          if ("${aResIndex}" STREQUAL "-1")
-            set (toProcessResFile FALSE)
+            set (toProcessResFile FALSE)
-          endif()
+          endif()
-        endif()
+        endif()
-
+
-        if (toProcessResFile)
+        if (toProcessResFile)
-          message(STATUS "Info. Generating header file from resource file: ${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}")
+          message(STATUS "Info. Generating header file from resource file: ${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}")
-
+
-          # generate content for header 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")
+          set (OCCT_HEADER_FILE_CONTENT "// This file has been automatically generated from resource file src/${CurrentResource_Directory}/${RESOURCE_FILE}\n\n")
-
+
-          # read resource file
+          # read resource file
-          file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}" RESOURCE_FILE_LINES_LIST)
+          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}[] =")
+          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}static const char ${CurrentResource_Directory}_${CurrentResource_FileName}[] =")
-          foreach (line IN LISTS RESOURCE_FILE_LINES_LIST)
+          foreach (line IN LISTS RESOURCE_FILE_LINES_LIST)
-            string (REPLACE "\"" "\\\"" line "${line}")
+            string (REPLACE "\"" "\\\"" line "${line}")
-            set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}\n  \"${line}\\n\"")
+            set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}\n  \"${line}\\n\"")
-          endforeach()
+          endforeach()
-          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT};")
+          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT};")
-
+
-          # Save generated content to header file
+          # Save generated content to header file
-          set (HEADER_FILE "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${HEADER_FILE_NAME}")
+          set (HEADER_FILE "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${HEADER_FILE_NAME}")
-          if (EXISTS "${HEADER_FILE}")
+          if (EXISTS "${HEADER_FILE}")
-            file (REMOVE "${HEADER_FILE}")
+            file (REMOVE "${HEADER_FILE}")
-          endif()
+          endif()
-          configure_file ("${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${HEADER_FILE}" @ONLY NEWLINE_STYLE LF)
+          configure_file ("${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${HEADER_FILE}" @ONLY NEWLINE_STYLE LF)
-        endif()
+        endif()
-      endif()
+      endif()
-    endforeach()
+    endforeach()
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-
+
-FILE_TO_LIST ("adm/RESOURCES" RESOURCES)
+FILE_TO_LIST ("adm/RESOURCES" RESOURCES)
-foreach (CurrentResource ${RESOURCES})
+foreach (CurrentResource ${RESOURCES})
-  get_filename_component (CurrentResource_FileName "${CurrentResource}" NAME)
+  get_filename_component (CurrentResource_FileName "${CurrentResource}" NAME)
-  if ("${CurrentResource_FileName}" STREQUAL TObj.msg OR
+  if ("${CurrentResource_FileName}" STREQUAL TObj.msg OR
-      "${CurrentResource_FileName}" STREQUAL BOPAlgo.msg OR
+      "${CurrentResource_FileName}" STREQUAL BOPAlgo.msg OR
-      "${CurrentResource_FileName}" STREQUAL Units.dat OR
+      "${CurrentResource_FileName}" STREQUAL Units.dat OR
-      "${CurrentResource}" STREQUAL XSMessage OR
+      "${CurrentResource}" STREQUAL XSMessage OR
-      "${CurrentResource}" STREQUAL SHMessage OR
+      "${CurrentResource}" STREQUAL SHMessage OR
-      "${CurrentResource}" STREQUAL Shaders)
+      "${CurrentResource}" STREQUAL Shaders)
-    OCCT_GENERATE_CONTENT_ONLY ("${CurrentResource}")
+    OCCT_GENERATE_CONTENT_ONLY ("${CurrentResource}")
-  endif()
+  endif()
-endforeach()
+endforeach()

adm/cmake/occt_toolkit.cmake

@@ -1,306 +1,500 @@
-# script for each OCCT toolkit
+# script for each OCCT toolkit
-
+
-# filling some variables by default values(src) or using custom(tools, samples)
+# filling some variables by default values(src) or using custom(tools, samples)
-set (RELATIVE_SOURCES_DIR "${RELATIVE_DIR}")
+set (RELATIVE_SOURCES_DIR "${RELATIVE_DIR}")
-if ("${RELATIVE_SOURCES_DIR}" STREQUAL "")
+if ("${RELATIVE_SOURCES_DIR}" STREQUAL "")
-  #if it is not defined, use default directory
+  #if it is not defined, use default directory
-  set (RELATIVE_SOURCES_DIR "src")
+  set (RELATIVE_SOURCES_DIR "src")
-endif()
+endif()
-
+
-set (OCC_MODULES_LIST "${MODULES_LIST}")
+set (OCC_MODULES_LIST "${MODULES_LIST}")
-if ("${OCC_MODULES_LIST}" STREQUAL "")
+if ("${OCC_MODULES_LIST}" STREQUAL "")
-  set (OCC_MODULES_LIST ${OCCT_MODULES})
+  set (OCC_MODULES_LIST ${OCCT_MODULES})
-endif()
+endif()
-
+
-set (OCC_TARGET_FOLDER "${TARGET_FOLDER}")
+set (OCC_TARGET_FOLDER "${TARGET_FOLDER}")
-if ("${OCC_TARGET_FOLDER}" STREQUAL "")
+if ("${OCC_TARGET_FOLDER}" STREQUAL "")
-  set (OCC_TARGET_FOLDER "Modules")
+  set (OCC_TARGET_FOLDER "Modules")
-endif()
+endif()
-
+
-set (OCCT_TOOLKITS_NAME_SUFFIX "${TOOLKITS_NAME_SUFFIX}")
+set (OCCT_TOOLKITS_NAME_SUFFIX "${TOOLKITS_NAME_SUFFIX}")
-if ("${OCCT_TOOLKITS_NAME_SUFFIX}" STREQUAL "")
+if ("${OCCT_TOOLKITS_NAME_SUFFIX}" STREQUAL "")
-  set (OCCT_TOOLKITS_NAME_SUFFIX "TOOLKITS")
+  set (OCCT_TOOLKITS_NAME_SUFFIX "TOOLKITS")
-endif()
+endif()
-
+
-# parse PACKAGES file
+# parse PACKAGES file
-EXTRACT_TOOLKIT_PACKAGES (${RELATIVE_SOURCES_DIR} ${PROJECT_NAME} USED_PACKAGES)
+FILE_TO_LIST ("${RELATIVE_SOURCES_DIR}/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
-if ("${USED_PACKAGES}" STREQUAL "")
+if ("${USED_PACKAGES}" STREQUAL "")
-  set (USED_PACKAGES ${PROJECT_NAME})
+  set (USED_PACKAGES ${PROJECT_NAME})
-endif()
+endif()
-
+
-if (USE_QT)
+if (USE_QT)
-  # Qt dependencies
+  # Qt dependencies
-  OCCT_INCLUDE_CMAKE_FILE (adm/cmake/qt_macro)
+  OCCT_INCLUDE_CMAKE_FILE (adm/cmake/qt_macro)
-  FIND_QT_PACKAGE(PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
+  FIND_QT_PACKAGE(PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
-  include_directories("${PROJECT_INCLUDES}")
+  include_directories("${PROJECT_INCLUDES}")
-endif(USE_QT)
+endif(USE_QT)
-
+
-set (PRECOMPILED_DEFS)
+set (PRECOMPILED_DEFS)
-
+
-if (NOT BUILD_SHARED_LIBS)
+if (NOT BUILD_SHARED_LIBS)
-  list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
+  list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
-  if (WIN32 AND NOT EXECUTABLE_PROJECT)
+  if (WIN32 AND NOT EXECUTABLE_PROJECT)
-    list (APPEND PRECOMPILED_DEFS "-DOCCT_STATIC_BUILD")
+    list (APPEND PRECOMPILED_DEFS "-DOCCT_STATIC_BUILD")
-  endif()
+  endif()
-endif()
+endif()
-
+
-# Get all used packages from toolkit
+# Get all used packages from toolkit
-UNSET(RESOURCE_FILES)
+UNSET(RESOURCE_FILES)
-foreach (OCCT_PACKAGE ${USED_PACKAGES})
+foreach (OCCT_PACKAGE ${USED_PACKAGES})
-  #remove part after "/" in the OCCT_PACKAGE variable if exists
+
-  string (FIND "${OCCT_PACKAGE}" "/" _index)
+  #remove part after "/" in the OCCT_PACKAGE variable if exists
-  if (_index GREATER -1)
+  string (FIND "${OCCT_PACKAGE}" "/" _index)
-    math (EXPR _index "${_index}")
+  if (_index GREATER -1)
-    string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
+    math (EXPR _index "${_index}")
-  else()
+    string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
-    set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
+  else()
-  endif()
+    set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
-
+  endif()
-  set (SOURCE_FILES)
+
-  set (HEADER_FILES)
+  if (WIN32)
-
+    list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE_NAME}_DLL")
-  EXTRACT_PACKAGE_FILES (${RELATIVE_SOURCES_DIR} ${OCCT_PACKAGE} ALL_FILES INCLUDE_FOLDER)
+  endif()
-
+
-  set (HEADER_FILES_FILTERING ${ALL_FILES})
+  set (SOURCE_FILES)
-  set (SOURCE_FILES_FILTERING ${ALL_FILES})
+  set (HEADER_FILES)
-  
+
-  list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|p|g|lxx)")
+  # Generate Flex and Bison files
-  
+  if (${BUILD_YACCLEX})
-  if(APPLE)
+    # flex files
-    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|mm)")
+    OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
-  else()
+    list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
-    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c)")
+
-  endif()
+    # bison files
-
+    OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
-  list (APPEND HEADER_FILES ${HEADER_FILES_FILTERING})
+    list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
-  list (APPEND SOURCE_FILES ${SOURCE_FILES_FILTERING})
+
-
+    if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
-  SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${HEADER_FILES_FILTERING}")
+      
-  SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${SOURCE_FILES_FILTERING}")
+      list (SORT SOURCE_FILES_FLEX)
-
+      list (SORT SOURCE_FILES_BISON)
-  list (APPEND USED_INCFILES ${HEADER_FILES})
+
-  list (APPEND USED_SRCFILES ${SOURCE_FILES})
+      math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
-
+      foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
-  if (USE_QT)
+
-    FIND_AND_INSTALL_QT_RESOURCES (${OCCT_PACKAGE} RESOURCE_FILES)
+        list (GET SOURCE_FILES_FLEX ${FLEX_FILE_INDEX} CURRENT_FLEX_FILE)
-    #message("Qt Resource files are: ${QT_RESOURCE_FILES} in ${OCCT_PACKAGE}")
+        get_filename_component (CURRENT_FLEX_FILE_NAME ${CURRENT_FLEX_FILE} NAME_WE)
-  endif(USE_QT)
+
-
+        list (GET SOURCE_FILES_BISON ${FLEX_FILE_INDEX} CURRENT_BISON_FILE)
-  #message("Resource files are: ${RESOURCE_FILES} in ${OCCT_PACKAGE}")
+        get_filename_component (CURRENT_BISON_FILE_NAME ${CURRENT_BISON_FILE} NAME_WE)
-  foreach(RESOURCE_FILE ${RESOURCE_FILES})
+          
-    SOURCE_GROUP ("Resource Files\\${OCCT_PACKAGE_NAME}" FILES "${RESOURCE_FILE}")
+        string (COMPARE EQUAL ${CURRENT_FLEX_FILE_NAME} ${CURRENT_BISON_FILE_NAME} ARE_FILES_EQUAL)
-  endforeach()
+
-endforeach()
+        if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
-string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
+
-
+          # Note: files are generated in original source directory (not in patch!)
-set (USED_RCFILE "")
+          set (FLEX_BISON_TARGET_DIR "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}")
-if (MSVC)
+
-  set (USED_RCFILE "${CMAKE_BINARY_DIR}/resources/${PROJECT_NAME}.rc")
+          # choose appropriate extension for generated files: "cxx" if source file contains
-
+          # instruction to generate C++ code, "c" otherwise
-  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in")
+          set (BISON_OUTPUT_FILE_EXT "c")
-    configure_file("${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
+          set (FLEX_OUTPUT_FILE_EXT "c")
-  else()
+          file (STRINGS "${CURRENT_BISON_FILE}" FILE_BISON_CONTENT)
-    configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
+          foreach (FILE_BISON_CONTENT_LINE ${FILE_BISON_CONTENT})
-  endif()
+            string (REGEX MATCH "%language \"C\\+\\+\"" CXX_BISON_LANGUAGE_FOUND ${FILE_BISON_CONTENT_LINE})
-endif()
+            if (CXX_BISON_LANGUAGE_FOUND)
-
+              set (BISON_OUTPUT_FILE_EXT "cxx")
-set (CURRENT_MODULE)
+            endif()
-foreach (OCCT_MODULE ${OCC_MODULES_LIST})
+          endforeach()
-  list (FIND ${OCCT_MODULE}_${OCCT_TOOLKITS_NAME_SUFFIX} ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
+
-
+          if (EXISTS ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
-  if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
+            message (STATUS "Info: remove old FLEX header file: ${FLEX_BISON_TARGET_DIR}/FlexLexer.h")
-    set (CURRENT_MODULE ${OCCT_MODULE})
+            file(REMOVE ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
-  endif()
+          endif()
-endforeach()
+
-
+          file (STRINGS "${CURRENT_FLEX_FILE}" FILE_FLEX_CONTENT)
-if (MSVC)
+          foreach (FILE_FLEX_CONTENT_LINE ${FILE_FLEX_CONTENT})
-  OCCT_INSERT_CODE_FOR_TARGET ()
+            string (REGEX MATCH "%option c\\+\\+" CXX_FLEX_LANGUAGE_FOUND ${FILE_FLEX_CONTENT_LINE})
-endif()
+            if (CXX_FLEX_LANGUAGE_FOUND)
-
+              set (FLEX_OUTPUT_FILE_EXT "cxx")
-if (USE_QT)
+
-  FIND_AND_WRAP_MOC_FILES("${USED_INCFILES}" "${PROJECT_NAME}_MOC_FILES")
+              # install copy of FlexLexer.h locally to allow further building without flex
-  #message("MOC files: ${${PROJECT_NAME}_MOC_FILES}")
+              if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
-endif (USE_QT)
+                configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${FLEX_BISON_TARGET_DIR}/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
-
+              endif()
-if (EXECUTABLE_PROJECT)
+            endif()
-  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
+          endforeach()
-
+          set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
-  install (TARGETS ${PROJECT_NAME}
+          set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.${FLEX_OUTPUT_FILE_EXT})
-           DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
+
-
+          if (EXISTS ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
-  if (EMSCRIPTEN)
+            message (STATUS "Info: remove old output BISON file: ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT}")
-    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}")
+            file(REMOVE ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
-  endif()
+          endif()
-else()
+          if (EXISTS ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.hxx)
-  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
+            message (STATUS "Info: remove old output BISON file: ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.hxx")
-
+            file(REMOVE ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.hxx)
-  if (MSVC)
+          endif()
-    if (BUILD_FORCE_RelWithDebInfo)
+          if (EXISTS ${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE})
-      set (aReleasePdbConf "Release")
+            message (STATUS "Info: remove old output FLEX file: ${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE}")
-    else()
+            file(REMOVE ${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE})
-      set (aReleasePdbConf)
+          endif()
-    endif()
+
-    if (BUILD_SHARED_LIBS)
+          BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} "${FLEX_BISON_TARGET_DIR}/${BISON_OUTPUT_FILE}"
-      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
+                        COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME} -l -M ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/=")
-             CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
+          FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} "${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE}"
-             DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
+                        COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME} -L")
-    else()
+          ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
-      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
+           
-             CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
+          list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
-             DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
+        endif()
-    endif()
+      endforeach()
-  endif()
+    endif()
-
+  endif()
-  if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
+
-    set (CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT ${CMAKE_SHARED_LIBRARY_SUFFIX})
+  # header files
-    set (CMAKE_SHARED_LIBRARY_SUFFIX "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES")
-  endif()
+    file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
-
+    file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
-  install (TARGETS ${PROJECT_NAME}
+    file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
-           EXPORT OpenCASCADE${CURRENT_MODULE}Targets
+
-           RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
+    file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
-           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
+    if(APPLE)
-           LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
+      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
-           INCLUDES DESTINATION ${INSTALL_DIR_INCLUDE})
+    endif()
-
+  else()
-  if (NOT WIN32)
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
-    if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
-      set (LINK_NAME    "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT}")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
-      set (LIBRARY_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+
-      OCCT_CREATE_SYMLINK_TO_FILE (${LIBRARY_NAME} ${LINK_NAME})
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
-    endif()
+    if(APPLE)
-  endif()
+      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
-endif()
+    endif()
-
+  endif()
-if (CURRENT_MODULE)
+    
-  set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "${OCC_TARGET_FOLDER}/${CURRENT_MODULE}")
+  list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
-  set_target_properties (${PROJECT_NAME} PROPERTIES MODULE "${CURRENT_MODULE}")
+  list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
-  if (APPLE)
+  if(APPLE)
-    if (NOT "${INSTALL_NAME_DIR}" STREQUAL "")
+    list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
-      set_target_properties (${PROJECT_NAME} PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "${INSTALL_NAME_DIR}")
+  endif()
-    endif()
+
-  endif()
+  foreach(HEADER_FILE ${HEADER_FILES})
-endif()
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-
+      message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-get_property (OCC_VERSION_MAJOR GLOBAL PROPERTY OCC_VERSION_MAJOR)
+      list (APPEND USED_INCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-get_property (OCC_VERSION_MINOR GLOBAL PROPERTY OCC_VERSION_MINOR)
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-get_property (OCC_VERSION_MAINTENANCE GLOBAL PROPERTY OCC_VERSION_MAINTENANCE)
+    else()
-
+      list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-set (OCC_SOVERSION "")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-if (BUILD_SOVERSION_NUMBERS GREATER 2)
+    endif()
-  set (OCC_SOVERSION "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
+  endforeach()
-elseif (BUILD_SOVERSION_NUMBERS GREATER 1)
+
-  set (OCC_SOVERSION "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}")
+  foreach(SOURCE_FILE ${SOURCE_FILES})
-elseif (BUILD_SOVERSION_NUMBERS GREATER 0)
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-  set (OCC_SOVERSION "${OCC_VERSION_MAJOR}")
+      message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-endif()
+      list (APPEND USED_SRCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}"
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-                                                  SOVERSION     "${OCC_SOVERSION}"
+    else()
-                                                  VERSION       "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
+      list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-set (USED_TOOLKITS_BY_CURRENT_PROJECT)
+    endif()
-set (USED_EXTERNLIB_AND_TOOLKITS)
+  endforeach()
-
+
-# SOME EXECUTABLE PROJECTS MAY USE CUSTOM TOOLKITS AND EXTERNAL LIBRARIES
+  if (USE_QT)
-if (CUSTOM_EXTERNLIB)
+    FIND_AND_INSTALL_QT_RESOURCES (${OCCT_PACKAGE} RESOURCE_FILES)
-  set (USED_EXTERNLIB_AND_TOOLKITS ${CUSTOM_EXTERNLIB})
+    #message("Qt Resource files are: ${QT_RESOURCE_FILES} in ${OCCT_PACKAGE}")
-  foreach (EXTERNAL_LIB ${CUSTOM_EXTERNLIB})
+  endif(USE_QT)
-    string (REGEX MATCH "^TK" TK_FOUND ${EXTERNAL_LIB})
+
-    if (TK_FOUND)
+  #message("Resource files are: ${RESOURCE_FILES} in ${OCCT_PACKAGE}")
-      list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${EXTERNAL_LIB})
+  foreach(RESOURCE_FILE ${RESOURCE_FILES})
-    endif()
+    SOURCE_GROUP ("Resource Files\\${OCCT_PACKAGE_NAME}" FILES "${RESOURCE_FILE}")
-  endforeach()
+  endforeach()
-else()
+endforeach()
-  EXTRACT_TOOLKIT_EXTERNLIB ("${RELATIVE_SOURCES_DIR}" "${PROJECT_NAME}" USED_EXTERNLIB_AND_TOOLKITS)
+string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
-  EXCTRACT_TOOLKIT_DEPS ("${RELATIVE_SOURCES_DIR}" "${PROJECT_NAME}" USED_TOOLKITS_BY_CURRENT_PROJECT _)
+
-  list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${PROJECT_NAME})
+set (USED_RCFILE "")
-endif()
+if (MSVC)
-
+  set (USED_RCFILE "${CMAKE_BINARY_DIR}/resources/${PROJECT_NAME}.rc")
-foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
+
-  string (REGEX MATCH "^ *#" COMMENT_FOUND ${USED_ITEM})
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in")
-  if (COMMENT_FOUND)
+    configure_file("${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
-    continue()
+  else()
-  endif()
+    configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
-
+  endif()
-  string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
+endif()
-  string (REGEX MATCH "^vtk" VTK_FOUND ${USED_ITEM})
+
-
+set (CURRENT_MODULE)
-  if (NOT "${VTK_FOUND}" STREQUAL "")
+foreach (OCCT_MODULE ${OCC_MODULES_LIST})
-    list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
+  list (FIND ${OCCT_MODULE}_${OCCT_TOOLKITS_NAME_SUFFIX} ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
-    if (BUILD_SHARED_LIBS AND INSTALL_VTK AND COMMAND OCCT_INSTALL_VTK)
+
-      OCCT_INSTALL_VTK(${USED_ITEM})
+  if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
-    endif()
+    set (CURRENT_MODULE ${OCCT_MODULE})
-    continue()
+  endif()
-  endif()
+endforeach()
-  # Search for 3rd-party libraries as a dependency
+
-  set (CURRENT_CSF ${${USED_ITEM}})
+if (MSVC)
-  if ("x${CURRENT_CSF}" STREQUAL "x")
+  OCCT_INSERT_CODE_FOR_TARGET ()
-    continue()
+endif()
-  endif()
+
-  if ("${CURRENT_CSF}" STREQUAL "${CSF_OpenGlLibs}")
+if (USE_QT)
-    add_definitions (-DHAVE_OPENGL)
+  FIND_AND_WRAP_MOC_FILES("${USED_INCFILES}" "${PROJECT_NAME}_MOC_FILES")
-  endif()
+  #message("MOC files: ${${PROJECT_NAME}_MOC_FILES}")
-  if ("${CURRENT_CSF}" STREQUAL "${CSF_OpenGlesLibs}")
+endif (USE_QT)
-    add_definitions (-DHAVE_GLES2)
+
-  endif()
+if (EXECUTABLE_PROJECT)
-  PROCESS_CSF_LIBRARIES ("${CURRENT_CSF}" USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT "${PROJECT_NAME}")
+  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
-endforeach()
+
-
+  if (DEFINED ${PROJECT_NAME}_DISABLE_COTIRE AND ${PROJECT_NAME}_DISABLE_COTIRE)
-if (APPLE)
+    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
-  list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
+    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-  if (NOT ${IS_X11_FOUND} EQUAL -1)
+  else()
-    find_package (X11 COMPONENTS X11)
+    # To avoid excluding of PROJECT_NAME from cotire tool, we may use cotire
-    if (NOT X11_FOUND)
+    # COTIRE_PREFIX_HEADER_IGNORE_PATH instead. But, practically it causes many 'undefined symbols' error.
-      message (STATUS "Warning: X11 is not found. It's required to install The XQuartz project: http://www.xquartz.org")
+    # So, we just exclude PROJECT_NAME from cotire list.
-    endif()
+    # if (DEFINED ${PROJECT_NAME}_COTIRE_IGNORE_PATH)
-  endif()
+    #   set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH "${${PROJECT_NAME}_COTIRE_IGNORE_PATH}")
-endif()
+    # endif()
-
+  endif()
-# Update list of used VTK libraries if OpenGL2 Rendering BackEnd is used.
+
-# Add VTK_OPENGL2_BACKEND definition.
+  install (TARGETS ${PROJECT_NAME}
-if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2" OR IS_VTK_9XX)
+           DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
-  add_definitions(-DVTK_OPENGL2_BACKEND)
+
-  foreach (VTK_EXCLUDE_LIBRARY vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL)
+  if (EMSCRIPTEN)
-    list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "${VTK_EXCLUDE_LIBRARY}" IS_VTK_OPENGL_FOUND)
+    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}")
-    if (NOT ${IS_VTK_OPENGL_FOUND} EQUAL -1)
+  endif()
-      list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${VTK_EXCLUDE_LIBRARY})
+else()
-      if (${VTK_EXCLUDE_LIBRARY} STREQUAL vtkRenderingOpenGL)
+  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
-        list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingOpenGL2)
+
-        if(VTK_MAJOR_VERSION GREATER 6)
+  if (DEFINED ${PROJECT_NAME}_DISABLE_COTIRE AND ${PROJECT_NAME}_DISABLE_COTIRE)
-          list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingGL2PSOpenGL2)
+    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
-        endif()
+    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-      endif()
+  else()
-    endif()
+    # To avoid excluding of PROJECT_NAME from cotire tool, we may use cotire
-  endforeach()
+    # COTIRE_PREFIX_HEADER_IGNORE_PATH instead. But, practically it causes many 'undefined symbols' error.
-else()
+    # So, we just exclude PROJECT_NAME from cotire list.
-  if(VTK_MAJOR_VERSION EQUAL 6 AND VTK_MINOR_VERSION GREATER 2 OR VTK_MAJOR_VERSION GREATER 6)
+    # if (DEFINED ${PROJECT_NAME}_COTIRE_IGNORE_PATH)
-    list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL" IS_VTK_RENDER_FREETYPE_FOUND)
+    #   set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH "${${PROJECT_NAME}_COTIRE_IGNORE_PATH}")
-    if (NOT ${IS_VTK_RENDER_FREETYPE_FOUND} EQUAL -1)
+    # endif()
-      list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL")
+  endif()
-    endif()
+
-  endif()
+  if (MSVC)
-endif()
+    if (BUILD_FORCE_RelWithDebInfo)
-
+      set (aReleasePdbConf "Release")
-if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
+    else()
-  if(IS_VTK_9XX)
+      set (aReleasePdbConf)
-    string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
+    endif()
-  endif()
+    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
-endif()
+             CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
-target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
+             DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
-
+  endif()
-if (USE_QT)
+
-  foreach (PROJECT_LIBRARY_DEBUG ${PROJECT_LIBRARIES_DEBUG})
+  if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
-    target_link_libraries (${PROJECT_NAME} debug ${PROJECT_LIBRARY_DEBUG})
+    set (CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT ${CMAKE_SHARED_LIBRARY_SUFFIX})
-  endforeach()
+    set (CMAKE_SHARED_LIBRARY_SUFFIX "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  foreach (PROJECT_LIBRARY_RELEASE ${PROJECT_LIBRARIES_RELEASE})
+  endif()
-    target_link_libraries (${PROJECT_NAME} optimized ${PROJECT_LIBRARY_RELEASE})
+
-  endforeach()
+  install (TARGETS ${PROJECT_NAME}
-endif()
+           EXPORT OpenCASCADE${CURRENT_MODULE}Targets
-
+           RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
-# suppress deprecation warnings inside OCCT itself for old gcc versions with unavailable Standard_DISABLE_DEPRECATION_WARNINGS
+           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+           LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6.0)
+           INCLUDES DESTINATION ${INSTALL_DIR_INCLUDE})
-    add_definitions("-DOCCT_NO_DEPRECATED")
+
-    message (STATUS "Warning: internal deprecation warnings by Standard_DEPRECATED have been disabled due to old gcc version being used")
+  if (NOT WIN32)
-  endif()
+    if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
-endif()
+      set (LINK_NAME    "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT}")
+      set (LIBRARY_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+      OCCT_CREATE_SYMLINK_TO_FILE (${LIBRARY_NAME} ${LINK_NAME})
+    endif()
+  endif()
+endif()
+
+if (CURRENT_MODULE)
+  set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "${OCC_TARGET_FOLDER}/${CURRENT_MODULE}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES MODULE "${CURRENT_MODULE}")
+  if (APPLE)
+    if (NOT "${INSTALL_NAME_DIR}" STREQUAL "")
+      set_target_properties (${PROJECT_NAME} PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "${INSTALL_NAME_DIR}")
+    endif()
+  endif()
+endif()
+
+get_property (OCC_VERSION_MAJOR GLOBAL PROPERTY OCC_VERSION_MAJOR)
+get_property (OCC_VERSION_MINOR GLOBAL PROPERTY OCC_VERSION_MINOR)
+get_property (OCC_VERSION_MAINTENANCE GLOBAL PROPERTY OCC_VERSION_MAINTENANCE)
+
+set (OCC_SOVERSION "")
+if (BUILD_SOVERSION_NUMBERS GREATER 2)
+  set (OCC_SOVERSION "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
+elseif (BUILD_SOVERSION_NUMBERS GREATER 1)
+  set (OCC_SOVERSION "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}")
+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)
+
+# parse EXTERNLIB file
+if (CUSTOM_EXTERNLIB)
+  set (USED_EXTERNLIB_AND_TOOLKITS ${CUSTOM_EXTERNLIB})
+else()
+  FILE_TO_LIST ("${RELATIVE_SOURCES_DIR}/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
+endif()
+foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
+  string (REGEX MATCH "^ *#" COMMENT_FOUND ${USED_ITEM})
+  if (NOT COMMENT_FOUND)
+    string (REGEX MATCH "^TK" TK_FOUND ${USED_ITEM})
+    string (REGEX MATCH "^vtk" VTK_FOUND ${USED_ITEM})
+    
+    if (NOT "${TK_FOUND}" STREQUAL "" OR NOT "${VTK_FOUND}" STREQUAL "")
+      list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
+      if (NOT "${VTK_FOUND}" STREQUAL "" AND BUILD_SHARED_LIBS AND INSTALL_VTK AND COMMAND OCCT_INSTALL_VTK)
+        OCCT_INSTALL_VTK(${USED_ITEM})
+      endif()
+    else()
+      string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
+      if ("${CSF_FOUND}" STREQUAL "")
+        message (STATUS "Info: ${USED_ITEM} from ${PROJECT_NAME} skipped due to it is empty")
+      else() # get CSF_ value
+        set (CURRENT_CSF ${${USED_ITEM}})
+        if (NOT "x${CURRENT_CSF}" STREQUAL "x")
+          if ("${CURRENT_CSF}" STREQUAL "${CSF_OpenGlLibs}")
+            add_definitions (-DHAVE_OPENGL)
+          endif()
+          if ("${CURRENT_CSF}" STREQUAL "${CSF_OpenGlesLibs}")
+            add_definitions (-DHAVE_GLES2)
+          endif()
+
+          set (LIBRARY_FROM_CACHE 0)
+          separate_arguments (CURRENT_CSF)
+          foreach (CSF_LIBRARY ${CURRENT_CSF})
+            string (TOLOWER "${CSF_LIBRARY}" CSF_LIBRARY)
+            string (REPLACE "+" "[+]" CSF_LIBRARY "${CSF_LIBRARY}")
+            string (REPLACE "." "" CSF_LIBRARY "${CSF_LIBRARY}")
+            get_cmake_property(ALL_CACHE_VARIABLES CACHE_VARIABLES)
+            string (REGEX MATCHALL "(^|;)3RDPARTY_[^;]+_LIBRARY[^;]*" ALL_CACHE_VARIABLES "${ALL_CACHE_VARIABLES}")
+            foreach (CACHE_VARIABLE ${ALL_CACHE_VARIABLES})
+              set (CURRENT_CACHE_LIBRARY ${${CACHE_VARIABLE}})
+              string (TOLOWER "${CACHE_VARIABLE}" CACHE_VARIABLE)
+
+              if (EXISTS "${CURRENT_CACHE_LIBRARY}" AND NOT IS_DIRECTORY "${CURRENT_CACHE_LIBRARY}")
+                string (REGEX MATCH "_${CSF_LIBRARY}$" IS_ENDING "${CACHE_VARIABLE}")
+                string (REGEX MATCH "^([a-z]+)" CSF_WO_VERSION "${CSF_LIBRARY}")
+                string (REGEX MATCH "_${CSF_WO_VERSION}$" IS_ENDING_WO_VERSION "${CACHE_VARIABLE}")
+                if ("3rdparty_${CSF_LIBRARY}_library" STREQUAL "${CACHE_VARIABLE}" OR
+                    "3rdparty_${CSF_WO_VERSION}_library" STREQUAL "${CACHE_VARIABLE}" OR
+                    NOT "x${IS_ENDING}" STREQUAL "x" OR
+                    NOT "x${IS_ENDING_WO_VERSION}" STREQUAL "x")
+                  list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT "${CURRENT_CACHE_LIBRARY}")
+                  set (LIBRARY_FROM_CACHE 1)
+                endif()
+              endif()
+            endforeach()
+          endforeach()
+
+          if (NOT ${LIBRARY_FROM_CACHE})
+            # prepare a list from a string with whitespaces
+            separate_arguments (CURRENT_CSF)
+            list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
+          endif()
+        endif()
+      endif()
+    endif()
+  endif()
+endforeach()
+
+if (APPLE)
+  list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
+  if (NOT ${IS_X11_FOUND} EQUAL -1)
+    find_package (X11 COMPONENTS X11)
+    if (NOT X11_FOUND)
+      message (STATUS "Warning: X11 is not found. It's required to install The XQuartz project: http://www.xquartz.org")
+    endif()
+  endif()
+endif()
+
+# Update list of used VTK libraries if OpenGL2 Rendering BackEnd is used.
+# Add VTK_OPENGL2_BACKEND definition.
+if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2" OR IS_VTK_9XX)
+  add_definitions(-DVTK_OPENGL2_BACKEND)
+  foreach (VTK_EXCLUDE_LIBRARY vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL)
+    list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "${VTK_EXCLUDE_LIBRARY}" IS_VTK_OPENGL_FOUND)
+    if (NOT ${IS_VTK_OPENGL_FOUND} EQUAL -1)
+      list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${VTK_EXCLUDE_LIBRARY})
+      if (${VTK_EXCLUDE_LIBRARY} STREQUAL vtkRenderingOpenGL)
+        list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingOpenGL2)
+        if(VTK_MAJOR_VERSION GREATER 6)
+          list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingGL2PSOpenGL2)
+        endif()
+      endif()
+    endif()
+  endforeach()
+else()
+  if(VTK_MAJOR_VERSION EQUAL 6 AND VTK_MINOR_VERSION GREATER 2 OR VTK_MAJOR_VERSION GREATER 6)
+    list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL" IS_VTK_RENDER_FREETYPE_FOUND)
+    if (NOT ${IS_VTK_RENDER_FREETYPE_FOUND} EQUAL -1)
+      list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL")
+    endif()
+  endif()
+endif()
+
+if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
+  if(IS_VTK_9XX)
+    string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
+  endif()
+  target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
+endif()
+
+if (USE_QT)
+  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()
+endif()
+
+# 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)
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6.0)
+    add_definitions("-DOCCT_NO_DEPRECATED")
+    message (STATUS "Warning: internal deprecation warnings by Standard_DEPRECATED have been disabled due to old gcc version being used")
+  endif()
+endif()
+
+# use Cotire to accelerate build via usage of precompiled headers
+if (BUILD_USE_PCH)
+  if (WIN32)
+    # prevent definition of min and max macros through inclusion of Windows.h
+    # (for cotire builds)
+    add_definitions("-DNOMINMAX")
+    # avoid warnings on deprecated names from standard C library (see strsafe.h)
+    add_definitions("-DSTRSAFE_NO_DEPRECATE")
+    # avoid "std::Equal1" warning in QANCollection_Stl.cxx in debug mode
+    # suggesting using msvc "Checked Iterators"
+    add_definitions("-D_SCL_SECURE_NO_WARNINGS")
+  endif()
+
+  # Exclude system-provided glext.h.
+  # These macros are already defined within OpenGl_GlFunctions.hxx,
+  # however we have to duplicate them here for building TKOpenGl with PCH.
+  add_definitions("-DGL_GLEXT_LEGACY")
+  add_definitions("-DGLX_GLXEXT_LEGACY")
+
+  # workaround for old gcc
+  if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+    add_definitions("-D__STDC_CONSTANT_MACROS")
+    add_definitions("-D__STDC_FORMAT_MACROS")
+  endif()
+
+  # unity builds are not used since they do not add speed but cause conflicts
+  # in TKV3d
+  set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
+
+  cotire(${PROJECT_NAME})
+endif()

adm/cmake/occt_toolkit_prepare_sample.cmake

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

adm/cmake/occt_toolkit_prepare_tool.cmake

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

adm/cmake/opencl.cmake

@@ -1,27 +1,27 @@
-#OpenCl
+#OpenCl
-
+
-SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER $ENV{AMDAPPSDKROOT}/include
+SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER $ENV{AMDAPPSDKROOT}/include
-                                                  $ENV{INTELOCLSDKROOT}/include
+                                                  $ENV{INTELOCLSDKROOT}/include
-                                                  $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc
+                                                  $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc
-                                                  $ENV{ATISTREAMSDKROOT}/include)
+                                                  $ENV{ATISTREAMSDKROOT}/include)
-
+
-
+
-IF(${COMPILER_BITNESS} STREQUAL 32)
+IF(${COMPILER_BITNESS} STREQUAL 32)
-  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86
+  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86
-                                               $ENV{INTELOCLSDKROOT}/lib/x86
+                                               $ENV{INTELOCLSDKROOT}/lib/x86
-                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32
+                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32
-                                               $ENV{ATISTREAMSDKROOT}/lib/x86)
+                                               $ENV{ATISTREAMSDKROOT}/lib/x86)
-ELSEIF(${COMPILER_BITNESS} STREQUAL 64)
+ELSEIF(${COMPILER_BITNESS} STREQUAL 64)
-  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86_64
+  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86_64
-                                               $ENV{INTELOCLSDKROOT}/lib/x64
+                                               $ENV{INTELOCLSDKROOT}/lib/x64
-                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64
+                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64
-                                               $ENV{ATISTREAMSDKROOT}/lib/x86_64)
+                                               $ENV{ATISTREAMSDKROOT}/lib/x86_64)
-ENDIF()
+ENDIF()
-
+
-THIRDPARTY_PRODUCT("OPENCL" "CL/cl.h" "OpenCL" "OpenCLd")
+THIRDPARTY_PRODUCT("OPENCL" "CL/cl.h" "OpenCL" "OpenCLd")
-
+
-# if CL/cl.h isn't found (and 3RDPARTY_OPENCL_INCLUDE_DIR isn't defined)
+# if CL/cl.h isn't found (and 3RDPARTY_OPENCL_INCLUDE_DIR isn't defined)
-# then try to find OpenCL/cl.h (all other variable won't be changed)
+# then try to find OpenCL/cl.h (all other variable won't be changed)
-IF(NOT 3RDPARTY_OPENCL_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_OPENCL_INCLUDE_DIR}")
+IF(NOT 3RDPARTY_OPENCL_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_OPENCL_INCLUDE_DIR}")
-  THIRDPARTY_PRODUCT("OPENCL" "OpenCL/cl.h" "OpenCL" "OpenCLd")
+  THIRDPARTY_PRODUCT("OPENCL" "OpenCL/cl.h" "OpenCL" "OpenCLd")
 ENDIF()

adm/cmake/openvr.cmake

@@ -1,18 +1,5 @@
-# OpenVR SDK
+# OpenVR SDK
-# 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.
+# 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
+# https://github.com/ValveSoftware/openvr
-
+
-# vcpkg processing
+THIRDPARTY_PRODUCT("OPENVR" "openvr.h" "CSF_OpenVR" "")
-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

@@ -1,41 +1,41 @@
-#qt
+#qt
-
+
-# Qt is searched manually first (just determine root)
+# Qt is searched manually first (just determine root)
-message (STATUS "Processing Qt 3-rd party")
+message (STATUS "Processing Qt 3-rd party")
-
+
-if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
+if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
-  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
+  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
-
+
-  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
+  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
-    set (3RDPARTY_QT_DIR "" CACHE PATH "The directory containing qt")
+    set (3RDPARTY_QT_DIR "" CACHE PATH "The directory containing qt")
-    message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR")
+    message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR")
-  endif()
+  endif()
-
+
-  # Combine directory name with absolute path and show in GUI
+  # 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)
+  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}")
+  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
-endif()
+endif()
-
+
-set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
+set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
-
+
-# Now set CMAKE_PREFIX_PATH to point to local Qt installation.
+# Now set CMAKE_PREFIX_PATH to point to local Qt installation.
-# Without this setting find_package() will not work
+# Without this setting find_package() will not work
-set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
+set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
-
+
-# Now we can apply standard CMake finder for Qt5. We do this mostly
+# 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
+# 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)
+find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
-if (NOT ${Qt5_FOUND})
+if (NOT ${Qt5_FOUND})
-  # Now we can apply standard CMake finder for Qt. We do this mostly
+  # Now we can apply standard CMake finder for Qt. We do this mostly
-  # to have qt4_wrap_cpp() function available
+  # to have qt4_wrap_cpp() function available
-  find_package(Qt4)
+  find_package(Qt4)
-  #message (STATUS "Qt4 cmake configuration")
+  #message (STATUS "Qt4 cmake configuration")
-else()
+else()
-  #message (STATUS "Qt5 cmake configuration")
+  #message (STATUS "Qt5 cmake configuration")
-endif()
+endif()
-
+
-if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}")
+if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}")
-  list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
+  list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
-else()
+else()
-  list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR)
+  list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR)
-endif()
+endif()

adm/cmake/qt_macro.cmake

@@ -1,117 +1,117 @@
-#qt
+#qt
-
+
-macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
+macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
-
+
-  if ("${3RDPARTY_QT_DIR}" STREQUAL "")
+  if ("${3RDPARTY_QT_DIR}" STREQUAL "")
-    message (FATAL_ERROR "Empty Qt dir")
+    message (FATAL_ERROR "Empty Qt dir")
-  endif()
+  endif()
-
+
-  if (${Qt5_FOUND})
+  if (${Qt5_FOUND})
-    #message (STATUS "Qt5 cmake configuration")
+    #message (STATUS "Qt5 cmake configuration")
-
+
-    set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}" "${Qt5Quick_INCLUDE_DIRS}" "${Qt5Xml_INCLUDE_DIRS}")
+    set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}" "${Qt5Quick_INCLUDE_DIRS}" "${Qt5Xml_INCLUDE_DIRS}")
-    set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
+    set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
-    set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
+    set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
-
+
-    # processing *.ts files to generate *.qm
+    # processing *.ts files to generate *.qm
-    find_package(Qt5LinguistTools)
+    find_package(Qt5LinguistTools)
-    get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease LOCATION)
+    get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease LOCATION)
-    mark_as_advanced(QT_LRELEASE_EXECUTABLE)
+    mark_as_advanced(QT_LRELEASE_EXECUTABLE)
-
+
-    GET_FILENAME_COMPONENT(QT_BINARY_DIR ${QT_LRELEASE_EXECUTABLE} DIRECTORY)
+    GET_FILENAME_COMPONENT(QT_BINARY_DIR ${QT_LRELEASE_EXECUTABLE} DIRECTORY)
-    MARK_AS_ADVANCED(QT_BINARY_DIR)
+    MARK_AS_ADVANCED(QT_BINARY_DIR)
-  else()
+  else()
-    #message (STATUS "Qt4 cmake configuration")
+    #message (STATUS "Qt4 cmake configuration")
-    set(PROJECT_INCLUDES ${QT_INCLUDES})
+    set(PROJECT_INCLUDES ${QT_INCLUDES})
-    if (WIN32)
+    if (WIN32)
-      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib;${3RDPARTY_QT_DIR}/lib/QtXmld4.lib")
+      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib;${3RDPARTY_QT_DIR}/lib/QtXmld4.lib")
-      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib;${3RDPARTY_QT_DIR}/lib/QtXml4.lib")
+      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib;${3RDPARTY_QT_DIR}/lib/QtXml4.lib")
-    else()
+    else()
-      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
+      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
-      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
+      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
-    endif(WIN32)
+    endif(WIN32)
-    find_program(QT_LRELEASE_EXECUTABLE lrelease)
+    find_program(QT_LRELEASE_EXECUTABLE lrelease)
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-
+
-macro (FIND_AND_WRAP_MOC_FILES HEADER_FILES GENERATED_MOC_FILES)
+macro (FIND_AND_WRAP_MOC_FILES HEADER_FILES GENERATED_MOC_FILES)
-  set (GENERATED_MOC_FILES "")
+  set (GENERATED_MOC_FILES "")
-  foreach (FILE ${HEADER_FILES})
+  foreach (FILE ${HEADER_FILES})
-    # processing only files where Q_OBJECT exists
+    # processing only files where Q_OBJECT exists
-    file(STRINGS "${FILE}" LINES REGEX "Q_OBJECT")
+    file(STRINGS "${FILE}" LINES REGEX "Q_OBJECT")
-    if(LINES)
+    if(LINES)
-      unset (MOC_FILE)
+      unset (MOC_FILE)
-      if (${Qt5_FOUND})
+      if (${Qt5_FOUND})
-        qt5_wrap_cpp(MOC_FILE ${FILE})
+        qt5_wrap_cpp(MOC_FILE ${FILE})
-      else()
+      else()
-        qt4_wrap_cpp(MOC_FILE ${FILE})
+        qt4_wrap_cpp(MOC_FILE ${FILE})
-      endif()
+      endif()
-      #message (STATUS "... Info: next MOC file ${MOC_FILE}")
+      #message (STATUS "... Info: next MOC file ${MOC_FILE}")
-      list(APPEND ${GENERATED_MOC_FILES} ${MOC_FILE})
+      list(APPEND ${GENERATED_MOC_FILES} ${MOC_FILE})
-     endif(LINES)
+     endif(LINES)
-  endforeach (FILE)
+  endforeach (FILE)
-
+
-endmacro()
+endmacro()
-
+
-macro (FIND_AND_WRAP_RESOURCE_FILE RESOURCE_FILE_NAME RCC_FILES)
+macro (FIND_AND_WRAP_RESOURCE_FILE RESOURCE_FILE_NAME RCC_FILES)
-  if(EXISTS "${RESOURCE_FILE_NAME}")
+  if(EXISTS "${RESOURCE_FILE_NAME}")
-    if (${Qt5_FOUND})
+    if (${Qt5_FOUND})
-      qt5_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
+      qt5_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
-    else()
+    else()
-      qt4_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
+      qt4_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
-      # suppress some GCC warnings coming from source files generated from .qrc resources
+      # suppress some GCC warnings coming from source files generated from .qrc resources
-      if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+      if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
-      endif()
+      endif()
-    endif()
+    endif()
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES)
+macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES)
-  if(EXISTS "${RESOURCE_FILE_NAME}")
+  if(EXISTS "${RESOURCE_FILE_NAME}")
-    if (${Qt5_FOUND})
+    if (${Qt5_FOUND})
-      qt5_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
+      qt5_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
-    else()
+    else()
-      qt4_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
+      qt4_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
-    endif()
+    endif()
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
+macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
-  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"   TS_FILES   REGEX ".+[.]ts")
-  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   QRC_FILES  REGEX ".+[.]qrc")
+  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   QRC_FILES  REGEX ".+[.]qrc")
-
+
-  string (FIND "${OCCT_PACKAGE}" "/" _index)
+  string (FIND "${OCCT_PACKAGE}" "/" _index)
-  if (_index GREATER -1)
+  if (_index GREATER -1)
-    math (EXPR _index "${_index}")
+    math (EXPR _index "${_index}")
-    string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
+    string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
-  else()
+  else()
-    set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
+    set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
-  endif(_index GREATER -1)
+  endif(_index GREATER -1)
-
+
-  #message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}")
+  #message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}")
-  foreach (QRC_FILE ${QRC_FILES})
+  foreach (QRC_FILE ${QRC_FILES})
-    set (QRC_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}")
+    set (QRC_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}")
-    if (EXISTS ${QRC_FILE_RELATIVE})
+    if (EXISTS ${QRC_FILE_RELATIVE})
-      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES)
+      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES)
-      list (APPEND ${RESOURCE_FILES} "${RCC_FILES}")
+      list (APPEND ${RESOURCE_FILES} "${RCC_FILES}")
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-
+
-  #message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}")
+  #message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}")
-  foreach (TS_FILE ${TS_FILES})
+  foreach (TS_FILE ${TS_FILES})
-    set (TS_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${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)
+    FIND_AND_WRAP_TS_FILE(${TS_FILE_RELATIVE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
-    if (EXISTS ${TS_FILE_RELATIVE})
+    if (EXISTS ${TS_FILE_RELATIVE})
-      list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}")
+      list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}")
-      list (APPEND ${RESOURCE_FILES} "${QM_FILES}")
+      list (APPEND ${RESOURCE_FILES} "${QM_FILES}")
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-
+
-  foreach (QM_FILE ${QM_FILES})
+  foreach (QM_FILE ${QM_FILES})
-    INSTALL(FILES ${QM_FILE} DESTINATION "${INSTALL_DIR_RESOURCE}/samples")
+    INSTALL(FILES ${QM_FILE} DESTINATION "${INSTALL_DIR_RESOURCE}/samples")
-    #message("install *.qm files (${QM_FILE}) to: ${INSTALL_DIR_RESOURCE}/samples")
+    #message("install *.qm files (${QM_FILE}) to: ${INSTALL_DIR_RESOURCE}/samples")
-  endforeach (QM_FILE ${QM_FILES})
+  endforeach (QM_FILE ${QM_FILES})
-endmacro()
+endmacro()
-
+

adm/cmake/rapidjson.cmake

@@ -1,94 +1,86 @@
-# RapidJSON
+# RapidJSON
-
+
-# vcpkg processing
+if (NOT DEFINED INSTALL_RAPIDJSON)
-if (BUILD_USE_VCPKG)
+  set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
-  find_package(RapidJSON CONFIG REQUIRED)
+endif()
-  set(CSF_RapidJSON rapidjson)
+
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/rapidjson")
+# RapidJSON directory
-  return()
+if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
-endif()
+  set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
-
+endif()
-if (NOT DEFINED INSTALL_RAPIDJSON)
+
-  set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
+# search for RapidJSON in user defined directory
-endif()
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-
+  if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-# RapidJSON directory
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
-if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
+    if (RAPIDJSON_DIR_NAME)
-  set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
+      set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
-endif()
+    endif()
-
+  endif()
-# search for RapidJSON in user defined directory
+endif()
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+
-  if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
-    if (RAPIDJSON_DIR_NAME)
+endif()
-      set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
+
-    endif()
+if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-  endif()
+
-endif()
+  set (HEADER_NAMES rapidjson/rapidjson.h)
-
+
-if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
+
-endif()
+  if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-
+    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
-if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+                                              PATHS ${3RDPARTY_RAPIDJSON_DIR}
-
+                                              PATH_SUFFIXES include rapidjson
-  set (HEADER_NAMES rapidjson/rapidjson.h)
+                                              CMAKE_FIND_ROOT_PATH_BOTH
-
+                                              NO_DEFAULT_PATH)
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
+  else()
-
+    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
-  if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+                                              PATH_SUFFIXES include rapidjson
-    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
-                                              PATHS ${3RDPARTY_RAPIDJSON_DIR}
+  endif()
-                                              PATH_SUFFIXES include rapidjson
+
-                                              CMAKE_FIND_ROOT_PATH_BOTH
+  # use default (CMake) RapidJSON search
-                                              NO_DEFAULT_PATH)
+  if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-  else()
+    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
+      set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
-                                              PATH_SUFFIXES include rapidjson
+      set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
+    endif()
-  endif()
+
-
+    find_package(RapidJSON QUIET)
-  # use default (CMake) RapidJSON search
+
-  if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+    # restore ENV{RapidJSON_DIR}
-    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-      set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
+      set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
-      set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
+    endif()
-    endif()
+
-
+    if (${RAPIDJSON_FOUND})
-    find_package(RapidJSON QUIET)
+      set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
-
+      set (3RDPARTY_RAPIDJSON_DIR         "${RAPIDJSON_ROOT_DIR}"    CACHE PATH "The directory containing RapidJSON" FORCE)
-    # restore ENV{RapidJSON_DIR}
+    endif()
-    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+  endif()
-      set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
+endif()
-    endif()
+
-
+if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-    if (${RAPIDJSON_FOUND})
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-      set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
+
-      set (3RDPARTY_RAPIDJSON_DIR         "${RAPIDJSON_ROOT_DIR}"    CACHE PATH "The directory containing RapidJSON" FORCE)
+  # Install header files
-    endif()
+  if (INSTALL_RAPIDJSON)
-  endif()
+    file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
-endif()
+    foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
-
+      if(IS_DIRECTORY "${SUBDIR}")
-if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+      else()
-
+        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-  # Install header files
+      endif()
-  if (INSTALL_RAPIDJSON)
+    endforeach()
-    file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
+  endif()
-    foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
+else()
-      if(IS_DIRECTORY "${SUBDIR}")
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+
-      else()
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
-        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+endif()
-      endif()
+
-    endforeach()
+# unset all redundant variables
-  endif()
+OCCT_CHECK_AND_UNSET(RapidJSON_DIR)
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
-endif()
-
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET(RapidJSON_DIR)

adm/cmake/tbb.cmake

@@ -1,261 +1,240 @@
-# tbb
+# tbb
-
+
-# vcpkg processing
+if (MSVC AND BUILD_SHARED_LIBS)
-if (BUILD_USE_VCPKG)
+  add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
-  find_package(TBB CONFIG REQUIRED)
+  add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
-  set(CSF_TBB TBB::tbb TBB::tbbmalloc)
+endif()
-  if (WIN32)
+
-    set (USED_3RDPARTY_TBB_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+if (NOT DEFINED INSTALL_TBB AND BUILD_SHARED_LIBS)
-  else()
+  set (INSTALL_TBB OFF CACHE BOOL "${INSTALL_TBB_DESCR}")
-    set (USED_3RDPARTY_TBB_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+endif()
-  endif()
+
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/tbb")
+# Initialize tbb directory.
-  return()
+if (NOT DEFINED 3RDPARTY_TBB_DIR)
-endif()
+  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
-
+endif()
-if (MSVC AND BUILD_SHARED_LIBS)
+
-  add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
+if (WIN32)
-  add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
+  if (NOT DEFINED 3RDPARTY_DIR)
-endif()
+    message (FATAL_ERROR "3RDPARTY_DIR is not defined.")
-
+  endif()
-if (NOT DEFINED INSTALL_TBB AND BUILD_SHARED_LIBS)
+  if ("${3RDPARTY_DIR}" STREQUAL "")
-  set (INSTALL_TBB OFF CACHE BOOL "${INSTALL_TBB_DESCR}")
+    message (FATAL_ERROR "3RDPARTY_DIR is empty string.")
-endif()
+  endif()
-
+  if (NOT EXISTS "${3RDPARTY_DIR}")
-# Initialize tbb directory.
+    message (FATAL_ERROR "3RDPARTY_DIR is not exist.")
-if (NOT DEFINED 3RDPARTY_TBB_DIR)
+  endif()
-  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
+
-endif()
+  # Below, we have correct 3RDPARTY_DIR.
-
+
-if (WIN32)
+  # Initialize TBB folder in connectin with 3RDPARTY_DIR.
-  if (NOT DEFINED 3RDPARTY_DIR)
+  if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
-    message (FATAL_ERROR "3RDPARTY_DIR is not defined.")
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
-  endif()
+    if (TBB_DIR_NAME)
-  if ("${3RDPARTY_DIR}" STREQUAL "")
+      set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
-    message (FATAL_ERROR "3RDPARTY_DIR is empty string.")
+    endif()
-  endif()
+  endif()
-  if (NOT EXISTS "${3RDPARTY_DIR}")
+
-    message (FATAL_ERROR "3RDPARTY_DIR is not exist.")
+  # Here we have full path name to installation directory of TBB.
-  endif()
+  # Employ it.
-
+  if (EXISTS "${3RDPARTY_TBB_DIR}")
-  # Below, we have correct 3RDPARTY_DIR.
+    find_package (
-
+      TBB 2021.5
-  # Initialize TBB folder in connection with 3RDPARTY_DIR.
+      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
-  if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
+      REQUIRED
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
+      CONFIG)
-    if (TBB_DIR_NAME)
+
-      set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+    # Achive include directory
-    endif()
+    get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-  endif()
+    if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-
+      set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
-  # Here we have full path name to installation directory of TBB.
+    endif()
-  # Employ it.
+    if (EXISTS "${TBB_INCLUDE_DIR}")
-  if (EXISTS "${3RDPARTY_TBB_DIR}")
+      set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
-    find_package (
+      list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
-      TBB 2021.5
+    else()
-      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-      REQUIRED
+    endif()
-      CONFIG)
+
-
+    separate_arguments (CSF_TBB)
-    # Archive include directory
+    foreach (LIB IN LISTS CSF_TBB)
-    get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
+      string(TOLOWER "${LIB}" LIB_LOWER)
-    if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
+      string(TOUPPER "${LIB}" LIB_UPPER)
-      set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
+
-    endif()
+      # Achive *.lib files and directory containing it.
-    if (EXISTS "${TBB_INCLUDE_DIR}")
+      get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_RELEASE)
-      set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
+      # Reserve cache variable for *.lib.
-      list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
-    else()
+        set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)")
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+      endif()
-    endif()
+      # Reserve cache variable for directory containing *.lib file.
-
+      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-    # Get installed configuration of tbb
+        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.lib)")
-    get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
+      endif()
-    list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+      if (EXISTS "${TBB_LIB_FILE}")
-
+        set (3RDPARTY_${LIB_UPPER}_LIBRARY
-    separate_arguments (CSF_TBB)
+             "${TBB_LIB_FILE}"
-    foreach (LIB IN LISTS CSF_TBB)
+             CACHE FILEPATH
-      string(TOLOWER "${LIB}" LIB_LOWER)
+             "${LIB_UPPER} library (*.lib)"
-      string(TOUPPER "${LIB}" LIB_UPPER)
+             FORCE)
-
+        get_filename_component (TBB_LIB_FILE_DIRECTORY "${TBB_LIB_FILE}" DIRECTORY)
-      # Archive *.lib files and directory containing it.
+        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
-      get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
+             "${TBB_LIB_FILE_DIRECTORY}"
-      # Reserve cache variable for *.lib.
+             CACHE PATH
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+             "The directory containing ${LIB_UPPER} library (*.lib)"
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)")
+             FORCE)
-      endif()
+        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
-      # Reserve cache variable for directory containing *.lib file.
+      else()
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
+        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.lib)")
+      endif()
-      endif()
+
-      if (EXISTS "${TBB_LIB_FILE}")
+      # Achive *.dll files and directory containing it.
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY
+      get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
-             "${TBB_LIB_FILE}"
+      # Reserve cache variable for *.dll.
-             CACHE FILEPATH
+      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
-             "${LIB_UPPER} library (*.lib)"
+        set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)")
-             FORCE)
+      endif()
-        get_filename_component (TBB_LIB_FILE_DIRECTORY "${TBB_LIB_FILE}" DIRECTORY)
+      # Reserve cache variable for directory containing *.dll file.
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
+      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL_DIR)
-             "${TBB_LIB_FILE_DIRECTORY}"
+        set (3RDPARTY_${LIB_UPPER}_DLL_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.dll)")
-             CACHE PATH
+      endif()
-             "The directory containing ${LIB_UPPER} library (*.lib)"
+      if (EXISTS "${TBB_DLL_FILE}")
-             FORCE)
+        set (3RDPARTY_${LIB_UPPER}_DLL
-        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
+             "${TBB_DLL_FILE}"
-      else()
+             CACHE FILEPATH
-        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
+             "${LIB_UPPER} library (*.dll)"
-      endif()
+             FORCE)
-
+        get_filename_component (TBB_DLL_FILE_DIRECTORY "${TBB_DLL_FILE}" DIRECTORY)
-      # Archive *.dll files and directory containing it.
+        set (3RDPARTY_${LIB_UPPER}_DLL_DIR
-      get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+             "${TBB_DLL_FILE_DIRECTORY}"
-      # Reserve cache variable for *.dll.
+             CACHE PATH
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
+             "The directory containing ${LIB_UPPER} library (*.dll)"
-        set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)")
+             FORCE)
-      endif()
+        list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIB_UPPER}_DLL_DIR}")
-      # Reserve cache variable for directory containing *.dll file.
+      else()
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL_DIR)
+        list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${LIB_UPPER}_DLL_DIR)
-        set (3RDPARTY_${LIB_UPPER}_DLL_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.dll)")
+      endif()
-      endif()
+
-      if (EXISTS "${TBB_DLL_FILE}")
+      # install *.dll (tbb & tbbmalloc)
-        set (3RDPARTY_${LIB_UPPER}_DLL
+      if (INSTALL_TBB)
-             "${TBB_DLL_FILE}"
+        OCCT_MAKE_OS_WITH_BITNESS()
-             CACHE FILEPATH
+        OCCT_MAKE_COMPILER_SHORT_NAME()
-             "${LIB_UPPER} library (*.dll)"
+
-             FORCE)
+        if (SINGLE_GENERATOR)
-        get_filename_component (TBB_DLL_FILE_DIRECTORY "${TBB_DLL_FILE}" DIRECTORY)
+          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
-        set (3RDPARTY_${LIB_UPPER}_DLL_DIR
+        else()
-             "${TBB_DLL_FILE_DIRECTORY}"
+          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_BIN}")
-             CACHE PATH
+          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_BIN}i")
-             "The directory containing ${LIB_UPPER} library (*.dll)"
+          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_BIN}d")
-             FORCE)
+        endif()
-        list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIB_UPPER}_DLL_DIR}")
+      endif()
-      else()
+      mark_as_advanced (3RDPARTY_${LIB_UPPER}_LIBRARY 3RDPARTY_${LIB_UPPER}_DLL)
-        list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${LIB_UPPER}_DLL_DIR)
+    endforeach()
-      endif()
+    if (INSTALL_TBB)
-
+      set (USED_3RDPARTY_TBB_DIR "")
-      # install *.dll (tbb & tbbmalloc)
+    else()
-      if (INSTALL_TBB)
+      # the *.dll/*.so* directory for using by the executable
-        OCCT_MAKE_OS_WITH_BITNESS()
+      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
-        OCCT_MAKE_COMPILER_SHORT_NAME()
+    endif()
-
+  else()
-        if (SINGLE_GENERATOR)
+    message (FATAL_ERROR "Installation directory with TBB is not exist.")
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
+  endif()
-        else()
+else ()
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_BIN}")
+  # NOT WIN32 branch
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_BIN}i")
+  if ((DEFINED 3RDPARTY_DIR) AND (NOT "${3RDPARTY_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_DIR}"))
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_BIN}d")
+    # Here, we have correct 3RDPARTY_DIR.
-        endif()
+    # Trying to specify TBB folder in connection with 3RDPARTY_DIR
-      endif()
+    if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
-      mark_as_advanced (3RDPARTY_${LIB_UPPER}_LIBRARY 3RDPARTY_${LIB_UPPER}_DLL)
+      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
-    endforeach()
+      if (TBB_DIR_NAME)
-    if (INSTALL_TBB)
+        set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
-      set (USED_3RDPARTY_TBB_DIR "")
+      endif()
-    else()
+    endif()
-      # the *.dll/*.so* directory for using by the executable
+    if ((NOT "${3RDPARTY_TBB_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_TBB_DIR}"))
-      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
+      # Find TBB 2021.5 in existing directory.
-    endif()
+      find_package (
-  else()
+      TBB 2021.5
-    message (FATAL_ERROR "Installation directory with TBB is not exist.")
+      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
-  endif()
+      REQUIRED
-else ()
+      CONFIG)
-  # NOT WIN32 branch
+    else()
-  if ((DEFINED 3RDPARTY_DIR) AND (NOT "${3RDPARTY_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_DIR}"))
+      # Find TBB 2021.5 in system directory.
-    # Here, we have correct 3RDPARTY_DIR.
+      find_package (
-    # Trying to specify TBB folder in connection with 3RDPARTY_DIR
+      TBB 2021.5
-    if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
+      REQUIRED
-      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
+      CONFIG)
-      if (TBB_DIR_NAME)
+    endif()
-        set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+  else()
-      endif()
+    # Find TBB 2021.5 in system directory.
-    endif()
+    find_package (
-    if ((NOT "${3RDPARTY_TBB_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_TBB_DIR}"))
+    TBB 2021.5
-      # Find TBB 2021.5 in existing directory.
+    REQUIRED
-      find_package (
+    CONFIG)
-      TBB 2021.5
+  endif()
-      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
+  # TBB has been configured (in other case FATAL_ERROR occures).
-      REQUIRED
+
-      CONFIG)
+  # Achive include directory.
-    else()
+  get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-      # Find TBB 2021.5 in system directory.
+  if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-      find_package (
+    set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
-      TBB 2021.5
+  endif()
-      REQUIRED
+  if (EXISTS "${TBB_INCLUDE_DIR}")
-      CONFIG)
+    set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
-    endif()
+    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
-  else()
+  else()
-    # Find TBB 2021.5 in system directory.
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-    find_package (
+  endif()
-    TBB 2021.5
+
-    REQUIRED
+  separate_arguments (CSF_TBB)
-    CONFIG)
+  foreach (LIB IN LISTS CSF_TBB)
-  endif()
+    string(TOLOWER "${LIB}" LIB_LOWER)
-  # TBB has been configured (in other case FATAL_ERROR occurs).
+    string(TOUPPER "${LIB}" LIB_UPPER)
-
+
-  # Archive include directory.
+    # Achive *.so files and directory containing it.
-  get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
-  if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
+    # Reserve cache variable for *.so.
-    set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
+    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
-  endif()
+      set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
-  if (EXISTS "${TBB_INCLUDE_DIR}")
+    endif()
-    set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
+    # Reserve cache variable for directory containing *.so file.
-    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-  else()
+      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.so)")
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+    endif()
-  endif()
+    if (EXISTS "${TBB_SO_FILE}")
-
+      set (3RDPARTY_${LIB_UPPER}_LIBRARY
-  # Get installed configuration of tbb
+           "${TBB_SO_FILE}"
-  get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
+           CACHE FILEPATH
-  list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+           "${LIB_UPPER} library (*.so)"
-
+           FORCE)
-  separate_arguments (CSF_TBB)
+      get_filename_component (TBB_SO_FILE_DIRECTORY "${TBB_SO_FILE}" DIRECTORY)
-  foreach (LIB IN LISTS CSF_TBB)
+      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
-    string(TOLOWER "${LIB}" LIB_LOWER)
+           "${TBB_SO_FILE_DIRECTORY}"
-    string(TOUPPER "${LIB}" LIB_UPPER)
+           CACHE PATH
-
+           "The directory containing ${LIB_UPPER} library (*.so)"
-    # Archive *.so files and directory containing it.
+           FORCE)
-    get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+      list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
-    # Reserve cache variable for *.so.
+    else()
-    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+      list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
+    endif()
-    endif()
+
-    # Reserve cache variable for directory containing *.so file.
+    # install *.so* (tbb & tbbmalloc)
-    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
+    if (INSTALL_TBB)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.so)")
+      OCCT_MAKE_OS_WITH_BITNESS()
-    endif()
+      OCCT_MAKE_COMPILER_SHORT_NAME()
-    if (EXISTS "${TBB_SO_FILE}")
+
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY
+      if (SINGLE_GENERATOR)
-           "${TBB_SO_FILE}"
+        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} DESTINATION "${INSTALL_DIR_LIB}")
-           CACHE FILEPATH
+      else()
-           "${LIB_UPPER} library (*.so)"
+        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_LIB}")
-           FORCE)
+        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_LIB}i")
-      get_filename_component (TBB_SO_FILE_DIRECTORY "${TBB_SO_FILE}" DIRECTORY)
+        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_LIB}d")
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
+      endif()
-           "${TBB_SO_FILE_DIRECTORY}"
+    endif()
-           CACHE PATH
+  endforeach()
-           "The directory containing ${LIB_UPPER} library (*.so)"
+  if (INSTALL_TBB)
-           FORCE)
+    set (USED_3RDPARTY_TBB_DIR "")
-      list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
+  else()
-    else()
+    # the *.so* directory for using by the executable
-      list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
+    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
-    endif()
+  endif()
-
+endif()
-    # install *.so* (tbb & tbbmalloc)
-    if (INSTALL_TBB)
-      OCCT_MAKE_OS_WITH_BITNESS()
-      OCCT_MAKE_COMPILER_SHORT_NAME()
-
-      if (SINGLE_GENERATOR)
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} DESTINATION "${INSTALL_DIR_LIB}")
-      else()
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_LIB}")
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_LIB}i")
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_LIB}d")
-      endif()
-    endif()
-  endforeach()
-  if (INSTALL_TBB)
-    set (USED_3RDPARTY_TBB_DIR "")
-  else()
-    # the *.so* directory for using by the executable
-    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
-  endif()
-endif()

adm/cmake/tcl.cmake

@@ -1,285 +1,281 @@
-# tcl
+# 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}")
+  set (INSTALL_TCL OFF CACHE BOOL "${INSTALL_TCL_DESCR}")
-endif()
+endif()
-
+
-# tcl directory
+# tcl directory
-if (NOT DEFINED 3RDPARTY_TCL_DIR)
+if (NOT DEFINED 3RDPARTY_TCL_DIR)
-  set (3RDPARTY_TCL_DIR "" CACHE PATH "The directory containing tcl")
+  set (3RDPARTY_TCL_DIR "" CACHE PATH "The directory containing tcl")
-endif()
+endif()
-
+
-# tcl include directory
+# tcl include directory
-if (NOT DEFINED 3RDPARTY_TCL_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_TCL_INCLUDE_DIR)
-  set (3RDPARTY_TCL_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tcl")
+  set (3RDPARTY_TCL_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tcl")
-endif()
+endif()
-
+
-if (BUILD_USE_VCPKG)
+
-  set (3RDPARTY_TCL_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tcl" FORCE)
+# tcl library file (with absolute path)
-  set (3RDPARTY_TCL_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" CACHE FILEPATH "The directory containing headers of tcl" FORCE)
+if (NOT DEFINED 3RDPARTY_TCL_LIBRARY OR NOT 3RDPARTY_TCL_LIBRARY_DIR)
-endif()
+  set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "tcl library"  FORCE)
-
+endif()
-# tcl library file (with absolute path)
+
-if (NOT DEFINED 3RDPARTY_TCL_LIBRARY OR NOT 3RDPARTY_TCL_LIBRARY_DIR)
+# tcl library directory
-  set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "tcl library"  FORCE)
+if (NOT DEFINED 3RDPARTY_TCL_LIBRARY_DIR)
-endif()
+  set (3RDPARTY_TCL_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tcl library")
-
+endif()
-# tcl library directory
+
-if (NOT DEFINED 3RDPARTY_TCL_LIBRARY_DIR)
+# tcl shared library (with absolute path)
-  set (3RDPARTY_TCL_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tcl library")
+if (WIN32)
-endif()
+  if (NOT DEFINED 3RDPARTY_TCL_DLL OR NOT 3RDPARTY_TCL_DLL_DIR)
-
+    set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "tcl shared library" FORCE)
-# tcl shared library (with absolute path)
+  endif()
-if (WIN32)
+endif()
-  if (NOT DEFINED 3RDPARTY_TCL_DLL OR NOT 3RDPARTY_TCL_DLL_DIR)
+
-    set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "tcl shared library" FORCE)
+# tcl shared library directory
-  endif()
+if (WIN32 AND NOT DEFINED 3RDPARTY_TCL_DLL_DIR)
-endif()
+  set (3RDPARTY_TCL_DLL_DIR "" CACHE FILEPATH "The directory containing tcl shared library")
-
+endif()
-# tcl shared library directory
+
-if (WIN32 AND NOT DEFINED 3RDPARTY_TCL_DLL_DIR)
+
-  set (3RDPARTY_TCL_DLL_DIR "" CACHE FILEPATH "The directory containing tcl shared library")
+# search for tcl in user defined directory
-endif()
+if (NOT 3RDPARTY_TCL_DIR AND 3RDPARTY_DIR)
-
+  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tcl TCL_DIR_NAME)
-
+  if (TCL_DIR_NAME)
-# search for tcl in user defined directory
+    set (3RDPARTY_TCL_DIR "${3RDPARTY_DIR}/${TCL_DIR_NAME}" CACHE PATH "The directory containing tcl" FORCE)
-if (NOT 3RDPARTY_TCL_DIR AND 3RDPARTY_DIR)
+  endif()
-  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tcl TCL_DIR_NAME)
+endif()
-  if (TCL_DIR_NAME)
+
-    set (3RDPARTY_TCL_DIR "${3RDPARTY_DIR}/${TCL_DIR_NAME}" CACHE PATH "The directory containing tcl" FORCE)
+# define paths for default engine
-  endif()
+if (3RDPARTY_TCL_DIR AND EXISTS "${3RDPARTY_TCL_DIR}")
-endif()
+  set (TCL_INCLUDE_PATH "${3RDPARTY_TCL_DIR}/include")
-
+endif()
-# define paths for default engine
+
-if (3RDPARTY_TCL_DIR AND EXISTS "${3RDPARTY_TCL_DIR}")
+# check tcl include dir, library dir and shared library dir
-  set (TCL_INCLUDE_PATH "${3RDPARTY_TCL_DIR}/include")
+COMPLIANCE_PRODUCT_CONSISTENCY(TCL)
-endif()
+
-
+# use default (CMake) TCL search
-# check tcl include dir, library dir and shared library dir
+find_package(TCL QUIET)
-COMPLIANCE_PRODUCT_CONSISTENCY(TCL)
+
-
+# tcl include dir
-# use default (CMake) TCL search
+if (NOT 3RDPARTY_TCL_INCLUDE_DIR)
-find_package(TCL QUIET)
+  if (TCL_INCLUDE_PATH AND EXISTS "${TCL_INCLUDE_PATH}")
-
+    set (3RDPARTY_TCL_INCLUDE_DIR "${TCL_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of TCL" FORCE)
-# tcl include dir
+  endif()
-if (NOT 3RDPARTY_TCL_INCLUDE_DIR)
+endif()
-  if (TCL_INCLUDE_PATH AND EXISTS "${TCL_INCLUDE_PATH}")
+
-    set (3RDPARTY_TCL_INCLUDE_DIR "${TCL_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of TCL" FORCE)
+# tcl dir and library
-  endif()
+if (NOT 3RDPARTY_TCL_LIBRARY)
-endif()
+  if (TCL_LIBRARY AND EXISTS "${TCL_LIBRARY}")
-
+    set (3RDPARTY_TCL_LIBRARY "${TCL_LIBRARY}" CACHE FILEPATH "TCL library" FORCE)
-# tcl dir and library
+
-if (NOT 3RDPARTY_TCL_LIBRARY)
+    if (NOT 3RDPARTY_TCL_LIBRARY_DIR)
-  if (TCL_LIBRARY AND EXISTS "${TCL_LIBRARY}")
+      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
-    set (3RDPARTY_TCL_LIBRARY "${TCL_LIBRARY}" CACHE FILEPATH "TCL library" FORCE)
+      set (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TCL library" FORCE)
-
+    endif()
-    if (NOT 3RDPARTY_TCL_LIBRARY_DIR)
+  endif()
-      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
+endif()
-      set (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TCL library" FORCE)
+
-    endif()
+if (WIN32)
-  endif()
+  if (NOT 3RDPARTY_TCL_DLL)
-endif()
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll .a)
-
+
-if (WIN32)
+    set (DLL_FOLDER_FOR_SEARCH "")
-  if (NOT 3RDPARTY_TCL_DLL)
+    if (3RDPARTY_TCL_DLL_DIR)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll .a)
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DLL_DIR}")
-
+    elseif (3RDPARTY_TCL_DIR)
-    set (DLL_FOLDER_FOR_SEARCH "")
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
-    if (3RDPARTY_TCL_DLL_DIR)
+    elseif (3RDPARTY_TCL_LIBRARY_DIR)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DLL_DIR}")
+      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR_PARENT "${3RDPARTY_TCL_LIBRARY_DIR}" PATH)
-    elseif (3RDPARTY_TCL_DIR)
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_LIBRARY_DIR_PARENT}/bin")
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
+    endif()
-    elseif (3RDPARTY_TCL_LIBRARY_DIR)
+
-      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR_PARENT "${3RDPARTY_TCL_LIBRARY_DIR}" PATH)
+    set (3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "TCL shared library" FORCE)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_LIBRARY_DIR_PARENT}/bin")
+    find_library (3RDPARTY_TCL_DLL NAMES ${CSF_TclLibs}
-    endif()
+                                         PATHS "${DLL_FOLDER_FOR_SEARCH}"
-
+                                         NO_DEFAULT_PATH)
-    set (3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "TCL shared library" FORCE)
+  endif()
-    find_library (3RDPARTY_TCL_DLL NAMES ${CSF_TclLibs}
+endif()
-                                         PATHS "${DLL_FOLDER_FOR_SEARCH}"
+
-                                         NO_DEFAULT_PATH)
+COMPLIANCE_PRODUCT_CONSISTENCY(TCL)
-  endif()
+
-endif()
+# tcl dir and library
-
+if (NOT 3RDPARTY_TCL_LIBRARY)
-COMPLIANCE_PRODUCT_CONSISTENCY(TCL)
+  set (3RDPARTY_TCL_LIBRARY "3RDPARTY_TCL_LIBRARY-NOTFOUND" CACHE FILEPATH "TCL library" FORCE)
-
+  find_library (3RDPARTY_TCL_LIBRARY NAMES ${CSF_TclLibs}
-# tcl dir and library
+                                           PATHS "${3RDPARTY_TCL_LIBRARY_DIR}"
-if (NOT 3RDPARTY_TCL_LIBRARY)
+                                           NO_DEFAULT_PATH)
-  set (3RDPARTY_TCL_LIBRARY "3RDPARTY_TCL_LIBRARY-NOTFOUND" CACHE FILEPATH "TCL library" FORCE)
+
-  find_library (3RDPARTY_TCL_LIBRARY NAMES ${CSF_TclLibs}
+  # search in another place if previous search doesn't find anything
-                                           PATHS "${3RDPARTY_TCL_LIBRARY_DIR}"
+  find_library (3RDPARTY_TCL_LIBRARY NAMES ${CSF_TclLibs}
-                                           NO_DEFAULT_PATH)
+                                           PATHS "${3RDPARTY_TCL_DIR}/lib"
-
+                                           NO_DEFAULT_PATH)
-  # search in another place if previous search doesn't find anything
+
-  find_library (3RDPARTY_TCL_LIBRARY NAMES ${CSF_TclLibs}
+  if (NOT 3RDPARTY_TCL_LIBRARY OR NOT EXISTS "${3RDPARTY_TCL_LIBRARY}")
-                                           PATHS "${3RDPARTY_TCL_DIR}/lib"
+    set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "TCL library" FORCE)
-                                           NO_DEFAULT_PATH)
+  endif()
-
+
-  if (NOT 3RDPARTY_TCL_LIBRARY OR NOT EXISTS "${3RDPARTY_TCL_LIBRARY}")
+  if (NOT 3RDPARTY_TCL_LIBRARY_DIR AND 3RDPARTY_TCL_LIBRARY)
-    set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "TCL library" FORCE)
+    get_filename_component (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
-  endif()
+    set (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TCL library" FORCE)
-
+  endif()
-  if (NOT 3RDPARTY_TCL_LIBRARY_DIR AND 3RDPARTY_TCL_LIBRARY)
+endif()
-    get_filename_component (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
+
-    set (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TCL library" FORCE)
+set (3RDPARTY_TCL_LIBRARY_VERSION "")
-  endif()
+if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
-endif()
+  get_filename_component (TCL_LIBRARY_NAME "${3RDPARTY_TCL_LIBRARY}" NAME)
-
+  string(REGEX REPLACE "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_LIBRARY_VERSION "${TCL_LIBRARY_NAME}")
-set (3RDPARTY_TCL_LIBRARY_VERSION "")
+
-if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
+  if (NOT "${TCL_LIBRARY_VERSION}" STREQUAL "${TCL_LIBRARY_NAME}")
-  get_filename_component (TCL_LIBRARY_NAME "${3RDPARTY_TCL_LIBRARY}" NAME)
+    set (3RDPARTY_TCL_LIBRARY_VERSION "${TCL_LIBRARY_VERSION}")
-  string(REGEX REPLACE "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_LIBRARY_VERSION "${TCL_LIBRARY_NAME}")
+  else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
-
+    message (STATUS "Info: TCL version isn't found")
-  if (NOT "${TCL_LIBRARY_VERSION}" STREQUAL "${TCL_LIBRARY_NAME}")
+  endif()
-    set (3RDPARTY_TCL_LIBRARY_VERSION "${TCL_LIBRARY_VERSION}")
+endif()
-  else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
+
-    message (STATUS "Info: TCL version isn't found")
+set (3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT "")
-  endif()
+if (3RDPARTY_TCL_LIBRARY_VERSION)
-endif()
+  string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_TCL_MAJOR_VERSION "${3RDPARTY_TCL_LIBRARY_VERSION}")
-
+  string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_TCL_MINOR_VERSION "${3RDPARTY_TCL_LIBRARY_VERSION}")
-set (3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT "")
+  set (3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_TCL_MAJOR_VERSION}.${3RDPARTY_TCL_MINOR_VERSION}")
-if (3RDPARTY_TCL_LIBRARY_VERSION)
+endif()
-  string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_TCL_MAJOR_VERSION "${3RDPARTY_TCL_LIBRARY_VERSION}")
+
-  string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_TCL_MINOR_VERSION "${3RDPARTY_TCL_LIBRARY_VERSION}")
+if (WIN32)
-  set (3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_TCL_MAJOR_VERSION}.${3RDPARTY_TCL_MINOR_VERSION}")
+  if (NOT 3RDPARTY_TCL_DLL)
-endif()
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll .a)
-
+
-if (WIN32)
+    set (DLL_FOLDER_FOR_SEARCH "")
-  if (NOT 3RDPARTY_TCL_DLL)
+    if (3RDPARTY_TCL_DLL_DIR)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll .a)
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DLL_DIR}")
-
+    elseif (3RDPARTY_TCL_DIR)
-    set (DLL_FOLDER_FOR_SEARCH "")
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
-    if (3RDPARTY_TCL_DLL_DIR)
+    else()
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DLL_DIR}")
+      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR_PARENT "${3RDPARTY_TCL_LIBRARY_DIR}" PATH)
-    elseif (3RDPARTY_TCL_DIR)
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_LIBRARY_DIR_PARENT}/bin")
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
+    endif()
-    else()
+
-      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR_PARENT "${3RDPARTY_TCL_LIBRARY_DIR}" PATH)
+    set (3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "TCL shared library" FORCE)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_LIBRARY_DIR_PARENT}/bin")
+    find_library (3RDPARTY_TCL_DLL NAMES tcl${3RDPARTY_TCL_LIBRARY_VERSION}
-    endif()
+                                         PATHS "${DLL_FOLDER_FOR_SEARCH}"
-
+                                         NO_DEFAULT_PATH)
-    set (3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "TCL shared library" FORCE)
+
-    find_library (3RDPARTY_TCL_DLL NAMES tcl${3RDPARTY_TCL_LIBRARY_VERSION}
+    if (NOT 3RDPARTY_TCL_DLL OR NOT EXISTS "${3RDPARTY_TCL_DLL}")
-                                         PATHS "${DLL_FOLDER_FOR_SEARCH}"
+      set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "TCL shared library" FORCE)
-                                         NO_DEFAULT_PATH)
+    endif()
-
+  endif()
-    if (NOT 3RDPARTY_TCL_DLL OR NOT EXISTS "${3RDPARTY_TCL_DLL}")
+  if (NOT 3RDPARTY_TCL_DLL_DIR AND 3RDPARTY_TCL_DLL)
-      set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "TCL shared library" FORCE)
+    get_filename_component (3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL}" PATH)
-    endif()
+    set (3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL_DIR}" CACHE FILEPATH "The directory containing TCL shared library" FORCE)
-  endif()
+  endif()
-  if (NOT 3RDPARTY_TCL_DLL_DIR AND 3RDPARTY_TCL_DLL)
+endif()
-    get_filename_component (3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL}" PATH)
+
-    set (3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL_DIR}" CACHE FILEPATH "The directory containing TCL shared library" FORCE)
+# include found paths to common variables
-  endif()
+if (3RDPARTY_TCL_INCLUDE_DIR AND EXISTS "${3RDPARTY_TCL_INCLUDE_DIR}")
-endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TCL_INCLUDE_DIR}")
-
+else()
-# include found paths to common variables
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_INCLUDE_DIR)
-if (3RDPARTY_TCL_INCLUDE_DIR AND EXISTS "${3RDPARTY_TCL_INCLUDE_DIR}")
+endif()
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TCL_INCLUDE_DIR}")
+
-else()
+if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TCL_LIBRARY_DIR}")
-endif()
+else()
-
+  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TCL_LIBRARY_DIR)
-if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
+endif()
-  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TCL_LIBRARY_DIR}")
+
-else()
+if (WIN32)
-  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TCL_LIBRARY_DIR)
+  if (3RDPARTY_TCL_DLL OR EXISTS "${3RDPARTY_TCL_DLL}")
-endif()
+    list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TCL_DLL_DIR}")
-
+  else()
-if (WIN32)
+    list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TCL_DLL_DIR)
-  if (3RDPARTY_TCL_DLL OR EXISTS "${3RDPARTY_TCL_DLL}")
+  endif()
-    list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TCL_DLL_DIR}")
+endif()
-  else()
+
-    list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TCL_DLL_DIR)
+# install tcl
-  endif()
+if (INSTALL_TCL)
-endif()
+  # include occt macros. compiler_bitness, os_wiht_bit, compiler
-
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-# install tcl
+
-if (INSTALL_TCL)
+  OCCT_MAKE_OS_WITH_BITNESS()
-  # include occt macros. compiler_bitness, os_wiht_bit, compiler
+  OCCT_MAKE_COMPILER_SHORT_NAME()
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+
-
+  if (WIN32)
-  OCCT_MAKE_OS_WITH_BITNESS()
+    # tcl 8.6 requires zlib. install all dlls from tcl bin folder that may contain zlib also
-  OCCT_MAKE_COMPILER_SHORT_NAME()
+
-
+    # collect and install all dlls from tcl dll dirs
-  if (WIN32)
+    file (GLOB TCL_DLLS "${3RDPARTY_TCL_DLL_DIR}/*.dll")
-    # tcl 8.6 requires zlib. install all dlls from tcl bin folder that may contain zlib also
+
-
+    if (SINGLE_GENERATOR)
-    # collect and install all dlls from tcl dll dirs
+      install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
-    file (GLOB TCL_DLLS "${3RDPARTY_TCL_DLL_DIR}/*.dll")
+    else()
-
+      install (FILES ${TCL_DLLS}
-    if (SINGLE_GENERATOR)
+               CONFIGURATIONS Release
-      install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
+               DESTINATION "${INSTALL_DIR_BIN}")
-    else()
+      install (FILES ${TCL_DLLS}
-      install (FILES ${TCL_DLLS}
+               CONFIGURATIONS RelWithDebInfo
-               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR_BIN}i")
-               DESTINATION "${INSTALL_DIR_BIN}")
+      install (FILES ${TCL_DLLS}
-      install (FILES ${TCL_DLLS}
+               CONFIGURATIONS Debug
-               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR_BIN}d")
-               DESTINATION "${INSTALL_DIR_BIN}i")
+    endif()
-      install (FILES ${TCL_DLLS}
+  else()
-               CONFIGURATIONS Debug
+    get_filename_component(3RDPARTY_TCL_LIBRARY_REALPATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
-               DESTINATION "${INSTALL_DIR_BIN}d")
+
-    endif()
+    if (SINGLE_GENERATOR)
-  else()
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
-    get_filename_component(3RDPARTY_TCL_LIBRARY_REALPATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
+    else()
-
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-    if (SINGLE_GENERATOR)
+               CONFIGURATIONS Release
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
+               DESTINATION "${INSTALL_DIR_LIB}")
-    else()
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+               CONFIGURATIONS RelWithDebInfo
-               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR_LIB}i")
-               DESTINATION "${INSTALL_DIR_LIB}")
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+               CONFIGURATIONS Debug
-               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR_LIB}d")
-               DESTINATION "${INSTALL_DIR_LIB}i")
+    endif()
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+  endif()
-               CONFIGURATIONS Debug
+
-               DESTINATION "${INSTALL_DIR_LIB}d")
+  if (TCL_TCLSH_VERSION)
-    endif()
+    # tcl is required to install in lib folder (without)
-  endif()
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR_LIB}")
-
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR_LIB}")
-  if (TCL_TCLSH_VERSION)
+  else()
-    # tcl is required to install in lib folder (without)
+    message (STATUS "\nWarning: tclX.X subdir won't be copied during the installation process.")
-    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR_LIB}")
+    message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
-    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR_LIB}")
+  endif()
-  else()
+
-    message (STATUS "\nWarning: tclX.X subdir won't be copied during the installation process.")
+  set (USED_3RDPARTY_TCL_DIR "")
-    message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
+else()
-  endif()
+  # the library directory for using by the executable
-
+  if (WIN32)
-  set (USED_3RDPARTY_TCL_DIR "")
+    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_DLL_DIR})
-else()
+  else()
-  # the library directory for using by the executable
+    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_LIBRARY_DIR})
-  if (WIN32)
+  endif()
-    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_DLL_DIR})
+endif()
-  else()
+
-    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_LIBRARY_DIR})
+mark_as_advanced (3RDPARTY_TCL_LIBRARY 3RDPARTY_TCL_DLL)
-  endif()
+
-endif()
+if (TK_FOUND AND 3RDPARTY_TCL_DIR)
-
+
-mark_as_advanced (3RDPARTY_TCL_LIBRARY 3RDPARTY_TCL_DLL)
+  get_filename_component (TK_WISH_ABSOLUTE          "${TK_WISH}"          ABSOLUTE)
-
+  get_filename_component (3RDPARTY_TCL_DIR_ABSOLUTE "${3RDPARTY_TCL_DIR}" ABSOLUTE)
-if (TK_FOUND AND 3RDPARTY_TCL_DIR)
+
-
+  string (FIND "${TK_WISH_ABSOLUTE}" "${3RDPARTY_TCL_DIR_ABSOLUTE}" THE_SAME_FOLDER)
-  get_filename_component (TK_WISH_ABSOLUTE          "${TK_WISH}"          ABSOLUTE)
+
-  get_filename_component (3RDPARTY_TCL_DIR_ABSOLUTE "${3RDPARTY_TCL_DIR}" ABSOLUTE)
+  if (${THE_SAME_FOLDER} EQUAL 0)
-
+    set (3RDPARTY_TCLTK_DIR "${3RDPARTY_TCL_DIR}")
-  string (FIND "${TK_WISH_ABSOLUTE}" "${3RDPARTY_TCL_DIR_ABSOLUTE}" THE_SAME_FOLDER)
+    message (STATUS "Info: TK is used from TCL folder: ${3RDPARTY_TCLTK_DIR}")
-
+  endif()
-  if (${THE_SAME_FOLDER} EQUAL 0)
+endif()
-    set (3RDPARTY_TCLTK_DIR "${3RDPARTY_TCL_DIR}")
+
-    message (STATUS "Info: TK is used from TCL folder: ${3RDPARTY_TCLTK_DIR}")
+# unset all redundant variables
-  endif()
+#TCL
-endif()
+OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
-
+OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
-# unset all redundant variables
+OCCT_CHECK_AND_UNSET (TCL_TCLSH)
-#TCL
+#TK
-OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
+OCCT_CHECK_AND_UNSET (TK_LIBRARY)
-OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TCL_TCLSH)
+OCCT_CHECK_AND_UNSET (TK_WISH)
-#TK
+
-OCCT_CHECK_AND_UNSET (TK_LIBRARY)
-OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TK_WISH)
-

adm/cmake/tk.cmake

@@ -1,293 +1,286 @@
-# tk
+# tk
-
+
-if (NOT DEFINED INSTALL_TK AND BUILD_SHARED_LIBS)
+if (NOT DEFINED INSTALL_TK AND BUILD_SHARED_LIBS)
-  set (INSTALL_TK OFF CACHE BOOL "${INSTALL_TK_DESCR}")
+  set (INSTALL_TK OFF CACHE BOOL "${INSTALL_TK_DESCR}")
-endif()
+endif()
-
+
-# tk directory
+# tk directory
-if (NOT DEFINED 3RDPARTY_TK_DIR)
+if (NOT DEFINED 3RDPARTY_TK_DIR)
-  set (3RDPARTY_TK_DIR "" CACHE PATH "The directory containing tk")
+  set (3RDPARTY_TK_DIR "" CACHE PATH "The directory containing tk")
-endif ()
+endif ()
-
+
-if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_TCLTK_DIR)
+if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_TCLTK_DIR)
-  set (3RDPARTY_TK_DIR "${3RDPARTY_TCLTK_DIR}" CACHE PATH "The directory containing tk" FORCE)
+  set (3RDPARTY_TK_DIR "${3RDPARTY_TCLTK_DIR}" CACHE PATH "The directory containing tk" FORCE)
-endif()
+endif()
-
+
-# tk include directory
+# tk include directory
-if (NOT DEFINED 3RDPARTY_TK_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_TK_INCLUDE_DIR)
-  set (3RDPARTY_TK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tk")
+  set (3RDPARTY_TK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tk")
-endif()
+endif()
-
+
-# if (BUILD_USE_VCPKG)
+if (BUILD_SHARED_LIBS)
-#   set (3RDPARTY_TK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tk" FORCE)
+  # tk library file (with absolute path)
-#   set (3RDPARTY_TCLTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tcltk" FORCE)
+  if (NOT DEFINED 3RDPARTY_TK_LIBRARY OR NOT 3RDPARTY_TK_LIBRARY_DIR)
-#   set (3RDPARTY_TK_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" CACHE FILEPATH "The directory containing headers of tk" FORCE)
+    set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "tk library" FORCE)
-# endif()
+  endif()
-
+
-if (BUILD_SHARED_LIBS)
+  # tk library directory
-  # tk library file (with absolute path)
+  if (NOT DEFINED 3RDPARTY_TK_LIBRARY_DIR)
-  if (NOT DEFINED 3RDPARTY_TK_LIBRARY OR NOT 3RDPARTY_TK_LIBRARY_DIR)
+    set (3RDPARTY_TK_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tk library")
-    set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "tk library" FORCE)
+  endif()
-  endif()
+
-
+  # tk shared library (with absolute path)
-  # tk library directory
+  if (WIN32)
-  if (NOT DEFINED 3RDPARTY_TK_LIBRARY_DIR)
+    if (NOT DEFINED 3RDPARTY_TK_DLL OR NOT 3RDPARTY_TK_DLL_DIR)
-    set (3RDPARTY_TK_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tk library")
+      set (3RDPARTY_TK_DLL "" CACHE FILEPATH "tk shared library" FORCE)
-  endif()
+    endif()
-
+  endif()
-  # tk shared library (with absolute path)
+
-  if (WIN32)
+  # tk shared library directory
-    if (NOT DEFINED 3RDPARTY_TK_DLL OR NOT 3RDPARTY_TK_DLL_DIR)
+  if (WIN32 AND NOT DEFINED 3RDPARTY_TK_DLL_DIR)
-      set (3RDPARTY_TK_DLL "" CACHE FILEPATH "tk shared library" FORCE)
+    set (3RDPARTY_TK_DLL_DIR "" CACHE FILEPATH "The directory containing tk shared library")
-    endif()
+  endif()
-  endif()
+endif()
-
+
-  # tk shared library directory
+# search for tk in user defined directory
-  if (WIN32 AND NOT DEFINED 3RDPARTY_TK_DLL_DIR)
+if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_DIR)
-    set (3RDPARTY_TK_DLL_DIR "" CACHE FILEPATH "The directory containing tk shared library")
+  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tk TK_DIR_NAME)
-  endif()
+  if (TK_DIR_NAME)
-endif()
+    set (3RDPARTY_TK_DIR "${3RDPARTY_DIR}/${TK_DIR_NAME}" CACHE PATH "The directory containing tk" FORCE)
-
+  endif()
-# search for tk in user defined directory
+endif()
-if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_DIR)
+
-  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tk TK_DIR_NAME)
+# define paths for default engine
-  if (TK_DIR_NAME)
+if (3RDPARTY_TK_DIR AND EXISTS "${3RDPARTY_TK_DIR}")
-    set (3RDPARTY_TK_DIR "${3RDPARTY_DIR}/${TK_DIR_NAME}" CACHE PATH "The directory containing tk" FORCE)
+  set (TK_INCLUDE_PATH "${3RDPARTY_TK_DIR}/include")
-  endif()
+endif()
-endif()
+
-
+# check tk include dir, library dir and shared library dir
-# define paths for default engine
+COMPLIANCE_PRODUCT_CONSISTENCY(TK)
-if (3RDPARTY_TK_DIR AND EXISTS "${3RDPARTY_TK_DIR}")
+
-  set (TK_INCLUDE_PATH "${3RDPARTY_TK_DIR}/include")
+# use default (CMake) TCL search
-endif()
+find_package(TCL QUIET)
-
+
-# check tk include dir, library dir and shared library dir
+# tk include dir
-COMPLIANCE_PRODUCT_CONSISTENCY(TK)
+if (NOT 3RDPARTY_TK_INCLUDE_DIR)
-
+  if (TK_INCLUDE_PATH AND EXISTS "${TK_INCLUDE_PATH}")
-# use default (CMake) TCL search
+    set (3RDPARTY_TK_INCLUDE_DIR "${TK_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of TK" FORCE)
-find_package(TCL QUIET)
+  endif()
-
+endif()
-# tk include dir
+
-if (NOT 3RDPARTY_TK_INCLUDE_DIR)
+if (BUILD_SHARED_LIBS)
-  if (TK_INCLUDE_PATH AND EXISTS "${TK_INCLUDE_PATH}")
+  # tk dir and library
-    set (3RDPARTY_TK_INCLUDE_DIR "${TK_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of TK" FORCE)
+  if (NOT 3RDPARTY_TK_LIBRARY)
-  endif()
+    if (TK_LIBRARY AND EXISTS "${TK_LIBRARY}")
-endif()
+      set (3RDPARTY_TK_LIBRARY "${TK_LIBRARY}" CACHE FILEPATH "TK library" FORCE)
-
+
-if (BUILD_SHARED_LIBS)
+      if (NOT 3RDPARTY_TK_LIBRARY_DIR)
-  # tk dir and library
+        get_filename_component (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY}" PATH)
-  if (NOT 3RDPARTY_TK_LIBRARY)
+        set (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TK library" FORCE)
-    if (TK_LIBRARY AND EXISTS "${TK_LIBRARY}")
+      endif()
-      set (3RDPARTY_TK_LIBRARY "${TK_LIBRARY}" CACHE FILEPATH "TK library" FORCE)
+    endif()
-
+  endif()
-      if (NOT 3RDPARTY_TK_LIBRARY_DIR)
+
-        get_filename_component (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY}" PATH)
+
-        set (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TK library" FORCE)
+  if (WIN32)
-      endif()
+    if (NOT 3RDPARTY_TK_DLL)
-    endif()
+        set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll" ".a")
-  endif()
+
-
+        set (DLL_FOLDER_FOR_SEARCH "")
-
+        if (3RDPARTY_TK_DLL_DIR)
-  if (WIN32)
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DLL_DIR}")
-    if (NOT 3RDPARTY_TK_DLL)
+        elseif (3RDPARTY_TK_DIR)
-        set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll" ".a")
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DIR}/bin")
-
+        elseif (3RDPARTY_TK_LIBRARY_DIR)
-        set (DLL_FOLDER_FOR_SEARCH "")
+          get_filename_component (3RDPARTY_TK_LIBRARY_DIR_PARENT "${3RDPARTY_TK_LIBRARY_DIR}" PATH)
-        if (3RDPARTY_TK_DLL_DIR)
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_LIBRARY_DIR_PARENT}/bin")
-          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DLL_DIR}")
+        endif()
-        elseif (3RDPARTY_TK_DIR)
+
-          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DIR}/bin")
+        set (3RDPARTY_TK_DLL "3RDPARTY_TK_DLL-NOTFOUND" CACHE FILEPATH "TK shared library" FORCE)
-        elseif (3RDPARTY_TK_LIBRARY_DIR)
+        find_library (3RDPARTY_TK_DLL NAMES ${CSF_TclTkLibs}
-          get_filename_component (3RDPARTY_TK_LIBRARY_DIR_PARENT "${3RDPARTY_TK_LIBRARY_DIR}" PATH)
+                                            PATHS "${DLL_FOLDER_FOR_SEARCH}"
-          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_LIBRARY_DIR_PARENT}/bin")
+                                            NO_DEFAULT_PATH)
-        endif()
+    endif()
-
+  endif()
-        set (3RDPARTY_TK_DLL "3RDPARTY_TK_DLL-NOTFOUND" CACHE FILEPATH "TK shared library" FORCE)
+endif()
-        find_library (3RDPARTY_TK_DLL NAMES ${CSF_TclTkLibs}
+
-                                            PATHS "${DLL_FOLDER_FOR_SEARCH}"
+COMPLIANCE_PRODUCT_CONSISTENCY(TK)
-                                            NO_DEFAULT_PATH)
+
-    endif()
+if (BUILD_SHARED_LIBS)
-  endif()
+  # tk dir and library
-endif()
+  if (NOT 3RDPARTY_TK_LIBRARY)
-
+    set (3RDPARTY_TK_LIBRARY "3RDPARTY_TK_LIBRARY-NOTFOUND" CACHE FILEPATH "TK library" FORCE)
-COMPLIANCE_PRODUCT_CONSISTENCY(TK)
+    find_library (3RDPARTY_TK_LIBRARY NAMES ${CSF_TclTkLibs}
-
+                                            PATHS "${3RDPARTY_TK_LIBRARY_DIR}"
-if (BUILD_SHARED_LIBS)
+                                            NO_DEFAULT_PATH)
-  # tk dir and library
+
-  if (NOT 3RDPARTY_TK_LIBRARY)
+    # search in another place if previous search doesn't find anything
-    set (3RDPARTY_TK_LIBRARY "3RDPARTY_TK_LIBRARY-NOTFOUND" CACHE FILEPATH "TK library" FORCE)
+    find_library (3RDPARTY_TK_LIBRARY NAMES ${CSF_TclTkLibs}
-    find_library (3RDPARTY_TK_LIBRARY NAMES ${CSF_TclTkLibs}
+                                            PATHS "${3RDPARTY_TK_DIR}/lib"
-                                            PATHS "${3RDPARTY_TK_LIBRARY_DIR}"
+                                            NO_DEFAULT_PATH)
-                                            NO_DEFAULT_PATH)
+
-
+
-    # search in another place if previous search doesn't find anything
+    if (NOT 3RDPARTY_TK_LIBRARY OR NOT EXISTS "${3RDPARTY_TK_LIBRARY}")
-    find_library (3RDPARTY_TK_LIBRARY NAMES ${CSF_TclTkLibs}
+      set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "TK library" FORCE)
-                                            PATHS "${3RDPARTY_TK_DIR}/lib"
+    endif()
-                                            NO_DEFAULT_PATH)
+
-
+    if (NOT 3RDPARTY_TK_LIBRARY_DIR AND 3RDPARTY_TK_LIBRARY)
-
+      get_filename_component (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY}" PATH)
-    if (NOT 3RDPARTY_TK_LIBRARY OR NOT EXISTS "${3RDPARTY_TK_LIBRARY}")
+      set (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TK library" FORCE)
-      set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "TK library" FORCE)
+    endif()
-    endif()
+  endif()
-
+
-    if (NOT 3RDPARTY_TK_LIBRARY_DIR AND 3RDPARTY_TK_LIBRARY)
+  set (3RDPARTY_TK_LIBRARY_VERSION "")
-      get_filename_component (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY}" PATH)
+  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
-      set (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TK library" FORCE)
+    get_filename_component (TK_LIBRARY_NAME "${3RDPARTY_TK_LIBRARY}" NAME)
-    endif()
+    string(REGEX REPLACE "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY_NAME}")
-  endif()
+
-
+    if (NOT "${TK_LIBRARY_VERSION}" STREQUAL "${TK_LIBRARY_NAME}")
-  set (3RDPARTY_TK_LIBRARY_VERSION "")
+      set (3RDPARTY_TK_LIBRARY_VERSION "${TK_LIBRARY_VERSION}")
-  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
+    else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
-    get_filename_component (TK_LIBRARY_NAME "${3RDPARTY_TK_LIBRARY}" NAME)
+      message (STATUS "Info: TK version isn't found")
-    string(REGEX REPLACE "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY_NAME}")
+    endif()
-
+  endif()
-    if (NOT "${TK_LIBRARY_VERSION}" STREQUAL "${TK_LIBRARY_NAME}")
+
-      set (3RDPARTY_TK_LIBRARY_VERSION "${TK_LIBRARY_VERSION}")
+  set (3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT "")
-    else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
+  if (3RDPARTY_TK_LIBRARY_VERSION)
-      message (STATUS "Info: TK version isn't found")
+    string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_TK_MAJOR_VERSION "${3RDPARTY_TK_LIBRARY_VERSION}")
-    endif()
+    string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_TK_MINOR_VERSION "${3RDPARTY_TK_LIBRARY_VERSION}")
-  endif()
+    set (3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_TK_MAJOR_VERSION}.${3RDPARTY_TK_MINOR_VERSION}")
-
+  endif()
-  set (3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT "")
+
-  if (3RDPARTY_TK_LIBRARY_VERSION)
+  if (WIN32)
-    string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_TK_MAJOR_VERSION "${3RDPARTY_TK_LIBRARY_VERSION}")
+    if (NOT 3RDPARTY_TK_DLL)
-    string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_TK_MINOR_VERSION "${3RDPARTY_TK_LIBRARY_VERSION}")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll" ".a")
-    set (3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_TK_MAJOR_VERSION}.${3RDPARTY_TK_MINOR_VERSION}")
+
-  endif()
+      set (DLL_FOLDER_FOR_SEARCH "")
-
+      if (3RDPARTY_TK_DLL_DIR)
-  if (WIN32)
+        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DLL_DIR}")
-    if (NOT 3RDPARTY_TK_DLL)
+      elseif (3RDPARTY_TK_DIR)
-      set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll" ".a")
+        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DIR}/bin")
-
+      else()
-      set (DLL_FOLDER_FOR_SEARCH "")
+        get_filename_component (3RDPARTY_TK_LIBRARY_DIR_PARENT "${3RDPARTY_TK_LIBRARY_DIR}" PATH)
-      if (3RDPARTY_TK_DLL_DIR)
+        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_LIBRARY_DIR_PARENT}/bin")
-        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DLL_DIR}")
+      endif()
-      elseif (3RDPARTY_TK_DIR)
+
-        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DIR}/bin")
+      set (3RDPARTY_TK_DLL "3RDPARTY_TK_DLL-NOTFOUND" CACHE FILEPATH "TK shared library" FORCE)
-      else()
+      find_library (3RDPARTY_TK_DLL NAMES tk${3RDPARTY_TK_LIBRARY_VERSION}
-        get_filename_component (3RDPARTY_TK_LIBRARY_DIR_PARENT "${3RDPARTY_TK_LIBRARY_DIR}" PATH)
+                                          PATHS "${DLL_FOLDER_FOR_SEARCH}"
-        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_LIBRARY_DIR_PARENT}/bin")
+                                          NO_DEFAULT_PATH)
-      endif()
+
-
+      if (NOT 3RDPARTY_TK_DLL OR NOT EXISTS "${3RDPARTY_TK_DLL}")
-      set (3RDPARTY_TK_DLL "3RDPARTY_TK_DLL-NOTFOUND" CACHE FILEPATH "TK shared library" FORCE)
+        set (3RDPARTY_TK_DLL "" CACHE FILEPATH "TK shared library" FORCE)
-      find_library (3RDPARTY_TK_DLL NAMES tk${3RDPARTY_TK_LIBRARY_VERSION}
+      endif()
-                                          PATHS "${DLL_FOLDER_FOR_SEARCH}"
+    endif()
-                                          NO_DEFAULT_PATH)
+    if (NOT 3RDPARTY_TK_DLL_DIR AND 3RDPARTY_TK_DLL)
-
+      get_filename_component (3RDPARTY_TK_DLL_DIR "${3RDPARTY_TK_DLL}" PATH)
-      if (NOT 3RDPARTY_TK_DLL OR NOT EXISTS "${3RDPARTY_TK_DLL}")
+      set (3RDPARTY_TK_DLL_DIR "${3RDPARTY_TK_DLL_DIR}" CACHE FILEPATH "The directory containing TK shared library" FORCE)
-        set (3RDPARTY_TK_DLL "" CACHE FILEPATH "TK shared library" FORCE)
+    endif()
-      endif()
+  endif()
-    endif()
+endif()
-    if (NOT 3RDPARTY_TK_DLL_DIR AND 3RDPARTY_TK_DLL)
+
-      get_filename_component (3RDPARTY_TK_DLL_DIR "${3RDPARTY_TK_DLL}" PATH)
+# include found paths to common variables
-      set (3RDPARTY_TK_DLL_DIR "${3RDPARTY_TK_DLL_DIR}" CACHE FILEPATH "The directory containing TK shared library" FORCE)
+if (3RDPARTY_TK_INCLUDE_DIR AND EXISTS "${3RDPARTY_TK_INCLUDE_DIR}")
-    endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TK_INCLUDE_DIR}")
-  endif()
+else()
-endif()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TK_INCLUDE_DIR)
-
+endif()
-# include found paths to common variables
+
-if (3RDPARTY_TK_INCLUDE_DIR AND EXISTS "${3RDPARTY_TK_INCLUDE_DIR}")
+if (BUILD_SHARED_LIBS)
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TK_INCLUDE_DIR}")
+  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
-else()
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TK_INCLUDE_DIR)
+  else()
-endif()
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TK_LIBRARY_DIR)
-
+  endif()
-if (BUILD_SHARED_LIBS)
+
-  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
+  if (WIN32)
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
+    if (3RDPARTY_TK_DLL OR EXISTS "${3RDPARTY_TK_DLL}")
-  else()
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TK_DLL_DIR}")
-    set (USE_TK OFF)
+    else()
-    message(STATUS "Warning: TK library is not found. TK will be disabled.")
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TK_DLL_DIR)
-  endif()
+    endif()
-
+  endif()
-  if (WIN32)
+
-    if (3RDPARTY_TK_DLL OR EXISTS "${3RDPARTY_TK_DLL}")
+  # install tk
-      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TK_DLL_DIR}")
+  if (INSTALL_TK)
-    else()
+    # include occt macros. compiler_bitness, os_wiht_bit, compiler
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TK_DLL_DIR)
+    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-    endif()
+
-  endif()
+    OCCT_MAKE_OS_WITH_BITNESS()
-
+    OCCT_MAKE_COMPILER_SHORT_NAME()
-  # install tk
+
-  if (INSTALL_TK)
+    if (WIN32)
-    # include occt macros. compiler_bitness, os_wiht_bit, compiler
+      # tk 8.6 requires zlib. install all dlls from tk bin folder that may contain zlib also
-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+
-
+      # collect and install all dlls from tk dll dirs
-    OCCT_MAKE_OS_WITH_BITNESS()
+      file (GLOB TK_DLLS  "${3RDPARTY_TK_DLL_DIR}/*.dll")
-    OCCT_MAKE_COMPILER_SHORT_NAME()
+
-
+      if (SINGLE_GENERATOR)
-    if (WIN32)
+        install (FILES ${TK_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
-      # tk 8.6 requires zlib. install all dlls from tk bin folder that may contain zlib also
+      else()
-
+        install (FILES ${TK_DLLS}
-      # collect and install all dlls from tk dll dirs
+                 CONFIGURATIONS Release
-      file (GLOB TK_DLLS  "${3RDPARTY_TK_DLL_DIR}/*.dll")
+                 DESTINATION "${INSTALL_DIR_BIN}")
-
+        install (FILES ${TK_DLLS}
-      if (SINGLE_GENERATOR)
+                 CONFIGURATIONS RelWithDebInfo
-        install (FILES ${TK_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR_BIN}i")
-      else()
+        install (FILES ${TK_DLLS}
-        install (FILES ${TK_DLLS}
+                 CONFIGURATIONS Debug
-                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR_BIN}d")
-                 DESTINATION "${INSTALL_DIR_BIN}")
+      endif()
-        install (FILES ${TK_DLLS}
+    else()
-                 CONFIGURATIONS RelWithDebInfo
+      get_filename_component(3RDPARTY_TK_LIBRARY_REALPATH ${3RDPARTY_TK_LIBRARY} REALPATH)
-                 DESTINATION "${INSTALL_DIR_BIN}i")
+
-        install (FILES ${TK_DLLS}
+      if (SINGLE_GENERATOR)
-                 CONFIGURATIONS Debug
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
-                 DESTINATION "${INSTALL_DIR_BIN}d")
+      else()
-      endif()
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-    else()
+                 CONFIGURATIONS Release
-      get_filename_component(3RDPARTY_TK_LIBRARY_REALPATH ${3RDPARTY_TK_LIBRARY} REALPATH)
+                 DESTINATION "${INSTALL_DIR_LIB}/")
-
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-      if (SINGLE_GENERATOR)
+                 CONFIGURATIONS RelWithDebInfo
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
+                 DESTINATION "${INSTALL_DIR_LIB}/i")
-      else()
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+                 CONFIGURATIONS Debug
-                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR_LIB}d")
-                 DESTINATION "${INSTALL_DIR_LIB}/")
+      endif()
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+    endif()
-                 CONFIGURATIONS RelWithDebInfo
+
-                 DESTINATION "${INSTALL_DIR_LIB}/i")
+    if (TCL_TCLSH_VERSION)
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+      # tk is required to install in lib folder (without)
-                 CONFIGURATIONS Debug
+      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR_LIB}")
-                 DESTINATION "${INSTALL_DIR_LIB}d")
+    else()
-      endif()
+      message (STATUS "\nWarning: tkX.X subdir won't be copied during the installation process.")
-    endif()
+      message (STATUS "Try seeking tk within another folder by changing 3RDPARTY_TK_DIR variable.")
-
+    endif()
-    if (TCL_TCLSH_VERSION)
+
-      # tk is required to install in lib folder (without)
+    set (USED_3RDPARTY_TK_DIR "")
-      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR_LIB}")
+  else()
-    else()
+    # the library directory for using by the executable
-      message (STATUS "\nWarning: tkX.X subdir won't be copied during the installation process.")
+    if (WIN32)
-      message (STATUS "Try seeking tk within another folder by changing 3RDPARTY_TK_DIR variable.")
+      set (USED_3RDPARTY_TK_DIR ${3RDPARTY_TK_DLL_DIR})
-    endif()
+    else()
-
+      set (USED_3RDPARTY_TK_DIR ${3RDPARTY_TK_LIBRARY_DIR})
-    set (USED_3RDPARTY_TK_DIR "")
+    endif()
-  else()
+  endif()
-    # the library directory for using by the executable
+
-    if (WIN32)
+  mark_as_advanced (3RDPARTY_TK_LIBRARY 3RDPARTY_TK_DLL)
-      set (USED_3RDPARTY_TK_DIR ${3RDPARTY_TK_DLL_DIR})
+endif()
-    else()
+
-      set (USED_3RDPARTY_TK_DIR ${3RDPARTY_TK_LIBRARY_DIR})
+# unset all redundant variables
-    endif()
+#TCL
-  endif()
+OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
-
+OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
-  mark_as_advanced (3RDPARTY_TK_LIBRARY 3RDPARTY_TK_DLL)
+OCCT_CHECK_AND_UNSET (TCL_TCLSH)
-endif()
+#TK
-
+OCCT_CHECK_AND_UNSET (TK_LIBRARY)
-# unset all redundant variables
+OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
-#TCL
+OCCT_CHECK_AND_UNSET (TK_WISH)
-OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
+
-OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
+if (NOT BUILD_SHARED_LIBS)
-OCCT_CHECK_AND_UNSET (TCL_TCLSH)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY)
-#TK
+  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY_DIR)
-OCCT_CHECK_AND_UNSET (TK_LIBRARY)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_DLL)
-OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_DLL_DIR)
-OCCT_CHECK_AND_UNSET (TK_WISH)
+  OCCT_CHECK_AND_UNSET (INSTALL_TK)
-
+endif()
-if (NOT BUILD_SHARED_LIBS)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY_DIR)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_DLL)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_DLL_DIR)
-  OCCT_CHECK_AND_UNSET (INSTALL_TK)
-endif()

adm/cmake/vardescr.cmake

@@ -1,221 +1,215 @@
-# variable description
+# variable description
-
+
-# 
+# 
-set (BUILD_PATCH_DESCR 
+set (BUILD_PATCH_DESCR 
-"Points to the directory recognized as a 'patch' for OCCT. If specified,
+"Points to the directory recognized as a 'patch' for OCCT. If specified,
-the files from this directory take precedence over the corresponding native
+the files from this directory take precedence over the corresponding native
-OCCT sources. This way you are able to introduce patches to Open CASCADE
+OCCT sources. This way you are able to introduce patches to Open CASCADE
-Technology not affecting the original source distribution")
+Technology not affecting the original source distribution")
-
+
-
+
-set (BUILD_LIBRARY_TYPE_DESCR 
+set (BUILD_LIBRARY_TYPE_DESCR 
-"Specifies the type of library to be created. 'Shared' libraries
+"Specifies the type of library to be created. 'Shared' libraries
-are linked dynamically and loaded at runtime. 'Static' libraries
+are linked dynamically and loaded at runtime. 'Static' libraries
-are archives of object files for use when linking other targets")
+are archives of object files for use when linking other targets")
-
+
-set (BUILD_YACCLEX_DESCR 
+set (BUILD_YACCLEX_DESCR 
-"Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and
+"Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and
-ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options
+ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options
-leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files")
+leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files")
-
+
-set (BUILD_RESOURCES_DESCR "Enables regeneration of OCCT resource files")
+set (BUILD_RESOURCES_DESCR "Enables regeneration of OCCT resource files")
-
+
-set (BUILD_WITH_DEBUG_DESCR
+set (BUILD_WITH_DEBUG_DESCR
-"Enables extended messages of many OCCT algorithms, usually printed to cout.
+"Enables extended messages of many OCCT algorithms, usually printed to cout.
-These include messages on internal errors and special cases encountered, timing etc.
+These include messages on internal errors and special cases encountered, timing etc.
-Applies only for Debug configuration.")
+Applies only for Debug configuration.")
-
+
-set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
+set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
-"Append the postfix to names of output libraries")
+"Append the postfix to names of output libraries")
-
+
-set (BUILD_SOVERSION_NUMBERS_DESCR
+set (BUILD_SOVERSION_NUMBERS_DESCR
-"Version numbers to put into SONAME: 0 - for empty, 1 - for major, 2 - for major.minor, 3 - for major.minor.maintenance")
+"Version numbers to put into SONAME: 0 - for empty, 1 - for major, 2 - for major.minor, 3 - for major.minor.maintenance")
-
+
-set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
+set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
-"Disables exceptions like Standard_OutOfRange in Release builds.
+"Disables exceptions like Standard_OutOfRange in Release builds.
-Defines No_Exception macros for Release builds when enabled (default).
+Defines No_Exception macros for Release builds when enabled (default).
-These exceptions are always enabled in Debug builds, but disable in Release for better performance")
+These exceptions are always enabled in Debug builds, but disable in Release for better performance")
-
+
-set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
+set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
-"Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
+"Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
-Corresponding environment variable (CSF_FPE) can be changed manually
+Corresponding environment variable (CSF_FPE) can be changed manually
-in custom.bat/sh scripts without regeneration by CMake.")
+in custom.bat/sh scripts without regeneration by CMake.")
-
+
-set (BUILD_FORCE_RelWithDebInfo_DESCR
+set (BUILD_FORCE_RelWithDebInfo_DESCR
-"Generate PDB files within normal Release build.")
+"Generate PDB files within normal Release build.")
-
+
-set (BUILD_USE_PCH_DESCR
+set (BUILD_USE_PCH_DESCR
-"Use precompiled headers to accelerate the build.
+"Use precompiled headers to accelerate the build.
-Precompiled headers are generated automatically by Cotire tool.")
+Precompiled headers are generated automatically by Cotire tool.")
-
+
-set (BUILD_INCLUDE_SYMLINK_DESCR
+# install variables
-"Include symbolic links to the source files in the build directory.
+set (INSTALL_DIR_DESCR 
-OFF - using a reference file with direct include to the origin,
+"The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
-ON - symbolic link to the origin file are created")
+samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_TBB and
-
+other similar variables) will be placed during the installation process (building INSTALL project)")
-# install variables
+
-set (INSTALL_DIR_DESCR 
+set (INSTALL_DIR_WITH_VERSION_DESCR
-"The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
+"Use OCCT version number as suffix for names of directories")
-samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_TBB and
+
-other similar variables) will be placed during the installation process (building INSTALL project)")
+set (INSTALL_DIR_LAYOUT_DESCR
-
+"Defines structure of OCCT files (binaries, resources, headers etc.) for the install directory.
-set (INSTALL_DIR_WITH_VERSION_DESCR
+Two variants are predefined: for Windows (standard OCCT layout) and for Unix operating systems (standard Linux layout).
-"Use OCCT version number as suffix for names of directories")
+If needed, layout can be customized with INSTALL_DIR_* variables.")
-
+
-set (INSTALL_DIR_LAYOUT_DESCR
+set (INSTALL_DIR_BIN_DESCR 
-"Defines structure of OCCT files (binaries, resources, headers etc.) for the install directory.
+"Subdirectory of INSTALL_DIR where binaries will be installed")
-Two variants are predefined: for Windows (standard OCCT layout) and for Unix operating systems (standard Linux layout).
+set (INSTALL_DIR_INCLUDE_DESCR 
-If needed, layout can be customized with INSTALL_DIR_* variables.")
+"Subdirectory of INSTALL_DIR where OCCT headers will be installed")
-
+set (INSTALL_DIR_DATA_DESCR 
-set (INSTALL_DIR_BIN_DESCR 
+"Subdirectory of INSTALL_DIR where sample data files will be installed")
-"Subdirectory of INSTALL_DIR where binaries will be installed")
+set (INSTALL_DIR_DOC_DESCR 
-set (INSTALL_DIR_INCLUDE_DESCR 
+"Subdirectory of INSTALL_DIR where documentation will be installed")
-"Subdirectory of INSTALL_DIR where OCCT headers will be installed")
+set (INSTALL_DIR_LIB_DESCR 
-set (INSTALL_DIR_DATA_DESCR 
+"Subdirectory of INSTALL_DIR where libraries (.so on Linux, .lib on Windows) will be installed")
-"Subdirectory of INSTALL_DIR where sample data files will be installed")
+set (INSTALL_DIR_RESOURCE_DESCR 
-set (INSTALL_DIR_DOC_DESCR 
+"Subdirectory of INSTALL_DIR where OCCT resource files will be installed")
-"Subdirectory of INSTALL_DIR where documentation will be installed")
+set (INSTALL_DIR_SAMPLES_DESCR 
-set (INSTALL_DIR_LIB_DESCR 
+"Subdirectory of INSTALL_DIR where samples will be installed")
-"Subdirectory of INSTALL_DIR where libraries (.so on Linux, .lib on Windows) will be installed")
+set (INSTALL_DIR_TESTS_DESCR 
-set (INSTALL_DIR_RESOURCE_DESCR 
+"Subdirectory of INSTALL_DIR where test scripts will be installed")
-"Subdirectory of INSTALL_DIR where OCCT resource files will be installed")
+set (INSTALL_DIR_SCRIPT_DESCR 
-set (INSTALL_DIR_SAMPLES_DESCR 
+"Subdirectory of INSTALL_DIR where scripts will be installed")
-"Subdirectory of INSTALL_DIR where samples will be installed")
+set (INSTALL_DIR_CMAKE_DESCR 
-set (INSTALL_DIR_TESTS_DESCR 
+"Subdirectory of INSTALL_DIR where CMake configuration files will be installed.
-"Subdirectory of INSTALL_DIR where test scripts will be installed")
+Must be three levels below INSTALL_DIR")
-set (INSTALL_DIR_SCRIPT_DESCR 
+
-"Subdirectory of INSTALL_DIR where scripts will be installed")
+macro (INSTALL_MESSAGE INSTALL_TARGET_VARIABLE INSTALL_TARGET_STRING)
-set (INSTALL_DIR_CMAKE_DESCR 
+set (${INSTALL_TARGET_VARIABLE}_DESCR
-"Subdirectory of INSTALL_DIR where CMake configuration files will be installed.
+"Indicates whether ${INSTALL_TARGET_STRING} should be installed (building INSTALL
-Must be three levels below INSTALL_DIR")
+project) into the installation directory (INSTALL_DIR variable)")
-
+endmacro()
-macro (INSTALL_MESSAGE INSTALL_TARGET_VARIABLE INSTALL_TARGET_STRING)
+
-set (${INSTALL_TARGET_VARIABLE}_DESCR
+INSTALL_MESSAGE (INSTALL_SAMPLES          "OCCT samples")
-"Indicates whether ${INSTALL_TARGET_STRING} should be installed (building INSTALL
+INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
-project) into the installation directory (INSTALL_DIR variable)")
+INSTALL_MESSAGE (INSTALL_DOC_Overview     "OCCT overview documentation (HTML format)")
-endmacro()
+INSTALL_MESSAGE (INSTALL_FFMPEG           "FFmpeg binaries")
-
+INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
-INSTALL_MESSAGE (INSTALL_SAMPLES          "OCCT samples")
+INSTALL_MESSAGE (INSTALL_OPENVR           "OpenVR binaries")
-INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
+INSTALL_MESSAGE (INSTALL_EIGEN            "EIGEN header files")
-INSTALL_MESSAGE (INSTALL_DOC_Overview     "OCCT overview documentation (HTML format)")
+INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
-INSTALL_MESSAGE (INSTALL_FFMPEG           "FFmpeg binaries")
+INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
-INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
+INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
-INSTALL_MESSAGE (INSTALL_OPENVR           "OpenVR binaries")
+INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
-INSTALL_MESSAGE (INSTALL_EIGEN            "EIGEN header files")
+INSTALL_MESSAGE (INSTALL_RAPIDJSON        "RapidJSON header files")
-INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
+INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
-INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
+INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
-INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
+INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
-INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
+
-INSTALL_MESSAGE (INSTALL_RAPIDJSON        "RapidJSON header files")
+# build variables
-INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
+macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)
-INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
+set (${BUILD_MODULE_TARGET_VARIABLE}_DESCR
-INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
+"Indicates whether ${BUILD_MODULE_TARGET_STRING} module should be built or not.
-
+It should be noted that some toolkits of the module can be built even if this module
-# build variables
+is not checked (this happens if some other modules depend on these toolkits)")
-macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)
+endmacro()
-set (${BUILD_MODULE_TARGET_VARIABLE}_DESCR
+
-"Indicates whether ${BUILD_MODULE_TARGET_STRING} module should be built or not.
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
-It should be noted that some toolkits of the module can be built even if this module
+BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
-is not checked (this happens if some other modules depend on these toolkits)")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
-endmacro()
+BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
-
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingData         "ModelingData")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_Visualization        "Visualization")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_DETools              "DETools")
+
-BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
+
-BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
+set (BUILD_ADDITIONAL_TOOLKITS_DESCR
-BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")
+"Semicolon-separated individual toolkits to include into build process. If you
-BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingData         "ModelingData")
+want to build some particular libraries (toolkits) only, then you may uncheck
-BUILD_MODULE_MESSAGE (BUILD_MODULE_Visualization        "Visualization")
+all modules in the corresponding BUILD_MODUE_* options and provide the list of
-
+necessary libraries here. Of course, all dependencies will be resolved automatically")
-
+
-set (BUILD_ADDITIONAL_TOOLKITS_DESCR
+set (BUILD_SAMPLES_MFC_DESCR
-"Semicolon-separated individual toolkits to include into build process. If you
+"Indicates whether OCCT MFC samples should be built together with OCCT.
-want to build some particular libraries (toolkits) only, then you may uncheck
+These samples show some possibilities of using OCCT and they can be executed
-all modules in the corresponding BUILD_MODUE_* options and provide the list of
+with script samples.bat from the installation directory (INSTALL_DIR)")
-necessary libraries here. Of course, all dependencies will be resolved automatically")
+
-
+set (BUILD_SAMPLES_QT_DESCR
-set (BUILD_SAMPLES_MFC_DESCR
+"Indicates whether OCCT Qt samples should be built together with OCCT.
-"Indicates whether OCCT MFC samples should be built together with OCCT.
+These samples show some possibilities of using OCCT and they can be executed
-These samples show some possibilities of using OCCT and they can be executed
+with script samples.bat from the installation directory (INSTALL_DIR)")
-with script samples.bat from the installation directory (INSTALL_DIR)")
+
-
+set (BUILD_Inspector_DESCR
-set (BUILD_SAMPLES_QT_DESCR
+"Indicates whether OCCT inspector should be built together with OCCT.
-"Indicates whether OCCT Qt samples should be built together with OCCT.
+This inspector provides functionality to interactively inspect low-level content
-These samples show some possibilities of using OCCT and they can be executed
+of the OCAF data model, OCCT viewer, etc. have been introduced in OCCT.
-with script samples.bat from the installation directory (INSTALL_DIR)")
+It can be executed with script inspector.bat from the installation directory (INSTALL_DIR) or
-
+using 'tinspector' command in DRAW interpretator")
-set (BUILD_Inspector_DESCR
+
-"Indicates whether OCCT inspector should be built together with OCCT.
+set (BUILD_MODULE_UwpSample_DESCR
-This inspector provides functionality to interactively inspect low-level content
+"Indicates whether OCCT UWP sample should be built together with OCCT.")
-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
+set (BUILD_DOC_Overview_DESCR
-using 'tinspector' command in DRAW interpretator")
+"Indicates whether OCCT overview documentation project (Markdown format) should be
-
+created together with OCCT. It is not built together with OCCT. Checking this options
-set (BUILD_MODULE_UwpSample_DESCR
+leads to automatic search of Doxygen binaries. Building of it will be call Doxygen command
-"Indicates whether OCCT UWP sample should be built together with OCCT.")
+to generate the documentation in HTML format. The documentation will be available in the
-
+installation directory (overview.bat script) if INSTALL_DOC_Overview variable is checked")
-set (BUILD_DOC_Overview_DESCR
+
-"Indicates whether OCCT overview documentation project (Markdown format) should be
+set (3RDPARTY_DIR_DESCR
-created together with OCCT. It is not built together with OCCT. Checking this options
+"The root directory where all required third-party products will be searched. If a
-leads to automatic search of Doxygen binaries. Building of it will be call Doxygen command
+third-party product have been found - corresponding CMake variables will be specified
-to generate the documentation in HTML format. The documentation will be available in the
+(VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
-installation directory (overview.bat script) if INSTALL_DOC_Overview variable is checked")
+
-
+set (USE_TK_DESCR
-set (3RDPARTY_DIR_DESCR
+"Indicates whether Tk product should be used by Draw Harness for user interface")
-"The root directory where all required third-party products will be searched. If a
+
-third-party product have been found - corresponding CMake variables will be specified
+set (USE_FREETYPE_DESCR
-(VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
+"Indicates whether FreeType product should be used in OCCT for text rendering using external font files")
-
+
-set (USE_TK_DESCR
+set (USE_FFMPEG_DESCR
-"Indicates whether Tk product should be used by Draw Harness for user interface")
+"Indicates whether FFmpeg framework is used or not. FFmpeg stands for
-
+multimedia data handling, open-source software libraries used for video encoding and decoding.")
-set (USE_FREETYPE_DESCR
+
-"Indicates whether FreeType product should be used in OCCT for text rendering using external font files")
+set (USE_FREEIMAGE_DESCR
-
+"Indicates whether FreeImage product should be used in OCCT visualization
-set (USE_FFMPEG_DESCR
+module for support of popular graphics image formats (PNG, BMP etc)")
-"Indicates whether FFmpeg framework is used or not. FFmpeg stands for
+
-multimedia data handling, open-source software libraries used for video encoding and decoding.")
+set (USE_OPENVR_DESCR
-
+"Indicates whether OpenVR should be used in OCCT visualization module for VR support")
-set (USE_FREEIMAGE_DESCR
+
-"Indicates whether FreeImage product should be used in OCCT visualization
+set (USE_RAPIDJSON_DESCR
-module for support of popular graphics image formats (PNG, BMP etc)")
+"Indicates whether RapidJSON product should be used in OCCT DataExchange
-
+module for support of JSON-based formats like glTF")
-set (USE_OPENVR_DESCR
+
-"Indicates whether OpenVR should be used in OCCT visualization module for VR support")
+set (USE_DRACO_DESCR
-
+"Indicates whether Draco mesh decoding library should be used by glTF reader")
-set (USE_RAPIDJSON_DESCR
+
-"Indicates whether RapidJSON product should be used in OCCT DataExchange
+set (USE_EGL_DESCR
-module for support of JSON-based formats like glTF")
+"Indicates whether EGL should be used in OCCT visualization
-
+module instead of conventional OpenGL context creation APIs")
-set (USE_DRACO_DESCR
+
-"Indicates whether Draco mesh decoding library should be used by glTF reader")
+set (USE_OPENGL_DESCR
-
+"Indicates whether OpenGL desktop should be used in OCCT visualization module")
-set (USE_EGL_DESCR
+set (USE_GLES2_DESCR
-"Indicates whether EGL should be used in OCCT visualization
+"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module")
-module instead of conventional OpenGL context creation APIs")
+
-
+set (USE_TBB_DESCR
-set (USE_OPENGL_DESCR
+"Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,
-"Indicates whether OpenGL desktop should be used in OCCT visualization module")
+the technology of Intel Corp, which comes with different mechanisms and patterns for
-set (USE_GLES2_DESCR
+injecting parallelism into your application. OCCT remains parallel even without TBB product")
-"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module")
+
-
+set (USE_VTK_DESCR
-set (USE_TBB_DESCR
+"Indicates whether VTK is used or not. VTK stands for Visualization
-"Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,
+ToolKit, the technology of Kitware Inc intended for general-purpose scientific
-the technology of Intel Corp, which comes with different mechanisms and patterns for
+visualization. OCCT comes with a bridge between CAD data representation and
-injecting parallelism into your application. OCCT remains parallel even without TBB product")
+VTK by means of its dedicated VIS component (VTK Integration Services).")
-
+
-set (USE_VTK_DESCR
+set (USE_XLIB_DESCR "Indicates whether X11 is used or not")
-"Indicates whether VTK is used or not. VTK stands for Visualization
+
-ToolKit, the technology of Kitware Inc intended for general-purpose scientific
+set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
-visualization. OCCT comes with a bridge between CAD data representation and
+
-VTK by means of its dedicated VIS component (VTK Integration Services).")
+macro (BUILD_MODULE MODULE_NAME)
-
+  set (ENABLE_MODULE TRUE)
-set (USE_XLIB_DESCR "Indicates whether X11 is used or not")
+  set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
-
+endmacro()
-set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
-
-macro (BUILD_MODULE MODULE_NAME)
-  set (ENABLE_MODULE TRUE)
-  set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
-endmacro()

adm/cmake/vtk.cmake

@@ -1,321 +1,307 @@
-# vtk
+# vtk
-
+
-# vcpkg processing
+if (NOT DEFINED INSTALL_VTK)
-if (BUILD_USE_VCPKG)
+  set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
-  find_package(VTK REQUIRED)
+endif()
-  set(CSF_VTK VTK::CommonCore)
+
-  set(IS_VTK_9XX 1)
+# vtk directory
-  if (WIN32)
+if (NOT DEFINED 3RDPARTY_VTK_DIR)
-    set (USED_3RDPARTY_VTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK")
-  else()
+endif()
-    set (USED_3RDPARTY_VTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+
-  endif()
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-  return()
+
-endif()
+# specify VTK folder in connectin with 3RDPARTY_DIR
-
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-if (NOT DEFINED INSTALL_VTK)
+  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_VTK_DIR PATH "The directory containing VTK")
-  set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
+
-endif()
+  if (NOT 3RDPARTY_VTK_DIR OR NOT EXISTS "${3RDPARTY_VTK_DIR}")
-
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" VTK VTK_DIR_NAME)
-# vtk directory
+    if (VTK_DIR_NAME)
-if (NOT DEFINED 3RDPARTY_VTK_DIR)
+      set (3RDPARTY_VTK_DIR "${3RDPARTY_DIR}/${VTK_DIR_NAME}" CACHE PATH "The directory containing VTK" FORCE)
-  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK")
+    endif()
-endif()
+  endif()
-
+else()
-# include occt macros. compiler_bitness, os_wiht_bit, compiler
+  #set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK" FORCE)
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+endif()
-
+
-# specify VTK folder in connectin with 3RDPARTY_DIR
+# vtk include directory
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
-  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_VTK_DIR PATH "The directory containing VTK")
+  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE PATH "The directory containing headers of VTK")
-
+endif()
-  if (NOT 3RDPARTY_VTK_DIR OR NOT EXISTS "${3RDPARTY_VTK_DIR}")
+
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" VTK VTK_DIR_NAME)
+#if (BUILD_SHARED_LIBS)
-    if (VTK_DIR_NAME)
+  # vtk library directory
-      set (3RDPARTY_VTK_DIR "${3RDPARTY_DIR}/${VTK_DIR_NAME}" CACHE PATH "The directory containing VTK" FORCE)
+  if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
-    endif()
+    set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE PATH "The directory containing VTK libraries")
-  endif()
+  endif()
-else()
+
-  #set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK" FORCE)
+  # vtk dll directory
-endif()
+  if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
-
+    set (3RDPARTY_VTK_DLL_DIR "" CACHE PATH "The directory containing VTK shared libraries")
-# vtk include directory
+  endif()
-if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
+#endif()
-  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE PATH "The directory containing headers of VTK")
+
-endif()
+# check 3RDPARTY_VTK_ paths for consistency with specified 3RDPARTY_VTK_DIR
-
+if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-#if (BUILD_SHARED_LIBS)
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_INCLUDE_DIR PATH "The directory containing headers of VTK")
-  # vtk library directory
+  if (BUILD_SHARED_LIBS)
-  if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_LIBRARY_DIR PATH "The directory containing VTK libraries")
-    set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE PATH "The directory containing VTK libraries")
+
-  endif()
+    if (WIN32)
-
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_DLL_DIR PATH "The directory containing VTK shared library")
-  # vtk dll directory
+    endif()
-  if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
+  endif()
-    set (3RDPARTY_VTK_DLL_DIR "" CACHE PATH "The directory containing VTK shared libraries")
+endif()
-  endif()
+
-#endif()
+if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-
+  set (CACHED_VTK_DIR $ENV{VTK_DIR})
-# check 3RDPARTY_VTK_ paths for consistency with specified 3RDPARTY_VTK_DIR
+  set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+endif()
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_INCLUDE_DIR PATH "The directory containing headers of VTK")
+
-  if (BUILD_SHARED_LIBS)
+find_package(VTK QUIET)
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_LIBRARY_DIR PATH "The directory containing VTK libraries")
+
-
+if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-    if (WIN32)
+  set (ENV{VTK_DIR} ${CACHED_VTK_DIR})
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_DLL_DIR PATH "The directory containing VTK shared library")
+endif()
-    endif()
+
-  endif()
+unset (IS_VTK_9XX)
-endif()
+if (VTK_FOUND)
-
+  message ("VTK version (${VTK_VERSION})")
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+  if(VTK_MAJOR_VERSION EQUAL 8 AND VTK_MINOR_VERSION GREATER 9 OR VTK_MAJOR_VERSION GREATER 8)
-  set (CACHED_VTK_DIR $ENV{VTK_DIR})
+    set (IS_VTK_9XX 1)
-  set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
+  else()
-endif()
+    # add compiler flags, preprocessor definitions, include and link dirs
-
+    include (${VTK_USE_FILE})
-find_package(VTK QUIET)
+  endif()
-
+
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+  if (VTK_LIBRARIES)
-  set (ENV{VTK_DIR} ${CACHED_VTK_DIR})
+
-endif()
+    set (3RDPARTY_VTK_INCLUDE_DIRS)
-
+
-unset (IS_VTK_9XX)
+#    if (BUILD_SHARED_LIBS)
-if (VTK_FOUND)
+      set (3RDPARTY_VTK_LIBRARY_DIRS)
-  message ("VTK version (${VTK_VERSION})")
+      set (3RDPARTY_VTK_DLL_DIRS)
-  if(VTK_MAJOR_VERSION EQUAL 8 AND VTK_MINOR_VERSION GREATER 9 OR VTK_MAJOR_VERSION GREATER 8)
+#    endif()
-    set (IS_VTK_9XX 1)
+
-  else()
+    foreach (VTK_LIBRARY ${VTK_LIBRARIES})
-    # add compiler flags, preprocessor definitions, include and link dirs
+      if (IS_VTK_9XX)
-    include (${VTK_USE_FILE})
+        string (REGEX MATCH "^VTK::" IS_VTK_LIBRARY ${VTK_LIBRARY})
-  endif()
+      else()
-
+        string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
-  if (VTK_LIBRARIES)
+      endif()
-
+      if (NOT IS_VTK_LIBRARY OR NOT TARGET ${VTK_LIBRARY})
-    set (3RDPARTY_VTK_INCLUDE_DIRS)
+        continue()
-
+      endif()
-#    if (BUILD_SHARED_LIBS)
+
-      set (3RDPARTY_VTK_LIBRARY_DIRS)
+      # get paths from corresponding variables
-      set (3RDPARTY_VTK_DLL_DIRS)
+      if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
-#    endif()
+        list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
-
+      endif()
-    foreach (VTK_LIBRARY ${VTK_LIBRARIES})
+
-      if (IS_VTK_9XX)
+      if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
-        string (REGEX MATCH "^VTK::" IS_VTK_LIBRARY ${VTK_LIBRARY})
+        list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
-      else()
+      endif()
-        string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
+
-      endif()
+      if (${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-      if (NOT IS_VTK_LIBRARY OR NOT TARGET ${VTK_LIBRARY})
+        list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-        continue()
+        if (NOT WIN32)
-      endif()
+          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-
+        endif()
-      # get paths from corresponding variables
+      endif()
-      if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
+
-        list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
+      # get paths from corresponding properties
-      endif()
+      get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY} IMPORTED_CONFIGURATIONS)
-
+      if (TARGET_VTK_IMPORT_CONFS)
-      if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
+        list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
-        list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
+
-      endif()
+        # todo: choose configuration in connection with the build type
-
+        #if (CMAKE_BUILD_TYPE)
-      if (${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+        #  foreach (IMPORT_CONF ${TARGET_VTK_IMPORT_CONFS})
-        list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+        #  endforeach()
-        if (NOT WIN32)
+        #endif()
-          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+
-        endif()
+        # Work-around against link failure in case if VTK contains dependency
-      endif()
+        # on DirectX: its run-time is always present on Windows, but SDK can
-
+        # be absent on current workstation, while not actually needed for
-      # get paths from corresponding properties
+        # OCCT linking.
-      get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY} IMPORTED_CONFIGURATIONS)
+        # VTK 6.1 for VC 10
-      if (TARGET_VTK_IMPORT_CONFS)
+        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
-        list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
-
+          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-        # todo: choose configuration in connection with the build type
+          if (HARDCODED_D3D9_LIB)
-        #if (CMAKE_BUILD_TYPE)
+            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
-        #  foreach (IMPORT_CONF ${TARGET_VTK_IMPORT_CONFS})
+
-        #  endforeach()
+            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
-        #endif()
+            set_target_properties (${VTK_LIBRARY} PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF} "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-
+          endif()
-        # Work-around against link failure in case if VTK contains dependency
+        endif()
-        # on DirectX: its run-time is always present on Windows, but SDK can
+        # VTK 6.1 for VC 12, 14
-        # be absent on current workstation, while not actually needed for
+        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} INTERFACE_LINK_LIBRARIES)
-        # OCCT linking.
+        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
-        # VTK 6.1 for VC 10
+          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
+          if (HARDCODED_D3D9_LIB)
-        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
+            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
-          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+
-          if (HARDCODED_D3D9_LIB)
+            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
-            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
+            set_target_properties (${VTK_LIBRARY} PROPERTIES INTERFACE_LINK_LIBRARIES "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-
+          endif()
-            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
+        endif()
-            set_target_properties (${VTK_LIBRARY} PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF} "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+
-          endif()
+        get_target_property (TARGET_PROPERTY_IMP_PATH ${VTK_LIBRARY} IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
-        endif()
+        if(TARGET_PROPERTY_IMP_PATH AND EXISTS "${TARGET_PROPERTY_IMP_PATH}")
-        # VTK 6.1 for VC 12, 14
+          get_filename_component (TARGET_PROPERTY_IMP_DIR "${TARGET_PROPERTY_IMP_PATH}" PATH)
-        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} INTERFACE_LINK_LIBRARIES)
+          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_IMP_DIR}")
-        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
+        endif()
-          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+
-          if (HARDCODED_D3D9_LIB)
+        get_target_property (TARGET_PROPERTY_LOCATION_PATH ${VTK_LIBRARY} IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
-            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
+        if(TARGET_PROPERTY_LOCATION_PATH AND EXISTS "${TARGET_PROPERTY_LOCATION_PATH}")
-
+          get_filename_component (TARGET_PROPERTY_LOCATION_DIR "${TARGET_PROPERTY_LOCATION_PATH}" PATH)
-            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
+
-            set_target_properties (${VTK_LIBRARY} PROPERTIES INTERFACE_LINK_LIBRARIES "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+          if (WIN32)
-          endif()
+            list (APPEND 3RDPARTY_VTK_DLL_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
-        endif()
+          else()
-
+            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
-        get_target_property (TARGET_PROPERTY_IMP_PATH ${VTK_LIBRARY} IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
+          endif()
-        if(TARGET_PROPERTY_IMP_PATH AND EXISTS "${TARGET_PROPERTY_IMP_PATH}")
+        endif()
-          get_filename_component (TARGET_PROPERTY_IMP_DIR "${TARGET_PROPERTY_IMP_PATH}" PATH)
+      endif()
-          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_IMP_DIR}")
+    endforeach()
-        endif()
+  endif()
-
+
-        get_target_property (TARGET_PROPERTY_LOCATION_PATH ${VTK_LIBRARY} IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+  if (3RDPARTY_VTK_INCLUDE_DIRS)
-        if(TARGET_PROPERTY_LOCATION_PATH AND EXISTS "${TARGET_PROPERTY_LOCATION_PATH}")
+    list (REMOVE_DUPLICATES 3RDPARTY_VTK_INCLUDE_DIRS)
-          get_filename_component (TARGET_PROPERTY_LOCATION_DIR "${TARGET_PROPERTY_LOCATION_PATH}" PATH)
+    list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIRS})
-
+
-          if (WIN32)
+    list (GET 3RDPARTY_VTK_INCLUDE_DIRS 0 3RDPARTY_VTK_INCLUDE_DIR)
-            list (APPEND 3RDPARTY_VTK_DLL_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
+    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
-          else()
+  endif()
-            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
+
-          endif()
+#  if (BUILD_SHARED_LIBS)
-        endif()
+    if (3RDPARTY_VTK_LIBRARY_DIRS)
-      endif()
+      list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
-    endforeach()
+      list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
-  endif()
+
-
+      list (GET 3RDPARTY_VTK_LIBRARY_DIRS 0 3RDPARTY_VTK_LIBRARY_DIR)
-  if (3RDPARTY_VTK_INCLUDE_DIRS)
+      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_LIBRARY_DIR}" CACHE PATH "The directory containing VTK libraries" FORCE)
-    list (REMOVE_DUPLICATES 3RDPARTY_VTK_INCLUDE_DIRS)
+    endif()
-    list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIRS})
+
-
+    if (WIN32)
-    list (GET 3RDPARTY_VTK_INCLUDE_DIRS 0 3RDPARTY_VTK_INCLUDE_DIR)
+      if (3RDPARTY_VTK_DLL_DIRS)
-    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
+        list (REMOVE_DUPLICATES 3RDPARTY_VTK_DLL_DIRS)
-  endif()
+        list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIRS})
-
+
-#  if (BUILD_SHARED_LIBS)
+        list (GET 3RDPARTY_VTK_DLL_DIRS 0 3RDPARTY_VTK_DLL_DIR)
-    if (3RDPARTY_VTK_LIBRARY_DIRS)
+        set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
-      list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
+      endif()
-      list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
+    endif()
-
+#  endif()
-      list (GET 3RDPARTY_VTK_LIBRARY_DIRS 0 3RDPARTY_VTK_LIBRARY_DIR)
+endif()
-      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_LIBRARY_DIR}" CACHE PATH "The directory containing VTK libraries" FORCE)
+
-    endif()
+if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
-
+  list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})
-    if (WIN32)
+else()
-      if (3RDPARTY_VTK_DLL_DIRS)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_INCLUDE_DIR)
-        list (REMOVE_DUPLICATES 3RDPARTY_VTK_DLL_DIRS)
+endif()
-        list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIRS})
+
-
+if (BUILD_SHARED_LIBS)
-        list (GET 3RDPARTY_VTK_DLL_DIRS 0 3RDPARTY_VTK_DLL_DIR)
+  if (3RDPARTY_VTK_LIBRARY_DIR AND EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
-        set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
+    list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIR})
-      endif()
+  else()
-    endif()
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_VTK_LIBRARY_DIR)
-#  endif()
+  endif()
-endif()
+
-
+  if (WIN32)
-if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
+    if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})
+      list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIR})
-elseif (NOT VTK_FOUND)
+    else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_INCLUDE_DIR)
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_VTK_DLL_DIR)
-endif()
+    endif()
-
+  endif()
-if (BUILD_SHARED_LIBS)
+endif()
-  if (3RDPARTY_VTK_LIBRARY_DIR AND EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
+
-    list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIR})
+# Install vtk library using vtk targets
-  else()
+macro (OCCT_INSTALL_VTK VTK_LIBRARY_NAME)
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_VTK_LIBRARY_DIR)
+  # Check that input library name contains "vtk" prefix
-  endif()
+  string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY_NAME})
-
+  # Check that input library was not already installed
-  if (WIN32)
+  list (FIND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME} VTK_LIBRARY_IS_USED)
-    if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
+  if (BUILD_SHARED_LIBS AND INSTALL_VTK AND TARGET ${VTK_LIBRARY_NAME} AND VTK_LIBRARY_IS_USED EQUAL -1 AND IS_VTK_LIBRARY)
-      list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIR})
+    OCCT_MAKE_OS_WITH_BITNESS()
-    else()
+
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_VTK_DLL_DIR)
+    # Get configuration of vtk
-    endif()
+    get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY_NAME} IMPORTED_CONFIGURATIONS)
-  endif()
+    list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
-endif()
+
-
+    # Get dependencies for current input library
-# Install vtk library using vtk targets
+    get_property(VTK_LIBRARY_PATH       TARGET ${VTK_LIBRARY_NAME} PROPERTY LOCATION)
-macro (OCCT_INSTALL_VTK VTK_LIBRARY_NAME)
+    get_property(VTK_DEPEND             TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES_${CHOSEN_IMPORT_CONF})
-  # Check that input library name contains "vtk" prefix
+    get_property(VTK_IMPORTED_INTERFACE TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
-  string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY_NAME})
+    get_property(VTK_INTERFACE          TARGET ${VTK_LIBRARY_NAME} PROPERTY INTERFACE_LINK_LIBRARIES)
-  # Check that input library was not already installed
+    list (APPEND VTK_DEPEND ${VTK_INTERFACE} ${VTK_IMPORTED_INTERFACE})
-  list (FIND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME} VTK_LIBRARY_IS_USED)
+
-  if (BUILD_SHARED_LIBS AND INSTALL_VTK AND TARGET ${VTK_LIBRARY_NAME} AND VTK_LIBRARY_IS_USED EQUAL -1 AND IS_VTK_LIBRARY)
+    # Install
-    OCCT_MAKE_OS_WITH_BITNESS()
+    if (WIN32)
-
+      if (SINGLE_GENERATOR)
-    # Get configuration of vtk
+        install (FILES "${VTK_LIBRARY_PATH}" DESTINATION "${INSTALL_DIR_BIN}")
-    get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY_NAME} IMPORTED_CONFIGURATIONS)
+      else()
-    list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+        install (FILES "${VTK_LIBRARY_PATH}"
-
+                 CONFIGURATIONS Release
-    # Get dependencies for current input library
+                 DESTINATION "${INSTALL_DIR_BIN}")
-    get_property(VTK_LIBRARY_PATH       TARGET ${VTK_LIBRARY_NAME} PROPERTY LOCATION)
+        install (FILES "${VTK_LIBRARY_PATH}"
-    get_property(VTK_DEPEND             TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES_${CHOSEN_IMPORT_CONF})
+                 CONFIGURATIONS RelWithDebInfo
-    get_property(VTK_IMPORTED_INTERFACE TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
+                 DESTINATION "${INSTALL_DIR_BIN}i")
-    get_property(VTK_INTERFACE          TARGET ${VTK_LIBRARY_NAME} PROPERTY INTERFACE_LINK_LIBRARIES)
+        install (FILES "${VTK_LIBRARY_PATH}"
-    list (APPEND VTK_DEPEND ${VTK_INTERFACE} ${VTK_IMPORTED_INTERFACE})
+                 CONFIGURATIONS Debug
-
+                 DESTINATION "${INSTALL_DIR_BIN}d")
-    # Install
+      endif()
-    if (WIN32)
+    else()
-      if (SINGLE_GENERATOR)
+      get_filename_component(3RDPARTY_VTK_LIBRARY_ABS ${VTK_LIBRARY_PATH} REALPATH)
-        install (FILES "${VTK_LIBRARY_PATH}" DESTINATION "${INSTALL_DIR_BIN}")
+
-      else()
+      if (SINGLE_GENERATOR)
-        install (FILES "${VTK_LIBRARY_PATH}"
+        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
-                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR_LIB}")
-                 DESTINATION "${INSTALL_DIR_BIN}")
+      else()
-        install (FILES "${VTK_LIBRARY_PATH}"
+        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR_LIB}")
-        install (FILES "${VTK_LIBRARY_PATH}"
+        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_LIB}i")
-      endif()
+        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
-    else()
+                 CONFIGURATIONS Debug
-      get_filename_component(3RDPARTY_VTK_LIBRARY_ABS ${VTK_LIBRARY_PATH} REALPATH)
+                 DESTINATION "${INSTALL_DIR_LIB}d")
-
+      endif()
-      if (SINGLE_GENERATOR)
+    endif()
-        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
+
-                 DESTINATION "${INSTALL_DIR_LIB}")
+    set (USED_3RDPARTY_VTK_DIR "")
-      else()
+
-        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
+    # Mark current library as already installed
-                 CONFIGURATIONS Release
+    list (APPEND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME})
-                 DESTINATION "${INSTALL_DIR_LIB}")
+    set (OCCT_VTK_USED_TARGETS "${OCCT_VTK_USED_TARGETS}" CACHE INTERNAL "" FORCE)
-        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
+
-                 CONFIGURATIONS RelWithDebInfo
+    # Recursively install all depended libraries
-                 DESTINATION "${INSTALL_DIR_LIB}i")
+    foreach(VTK_TARGET ${VTK_DEPEND})
-        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
+      OCCT_INSTALL_VTK(${VTK_TARGET})
-                 CONFIGURATIONS Debug
+    endforeach()
-                 DESTINATION "${INSTALL_DIR_LIB}d")
+  endif()
-      endif()
+endmacro()
-    endif()
+
-
+if (NOT BUILD_SHARED_LIBS)
-    set (USED_3RDPARTY_VTK_DIR "")
+  OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_DLL_DIR)
-
+  OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_LIBRARY_DIR)
-    # Mark current library as already installed
+  OCCT_CHECK_AND_UNSET(INSTALL_VTK)
-    list (APPEND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME})
+endif()
-    set (OCCT_VTK_USED_TARGETS "${OCCT_VTK_USED_TARGETS}" CACHE INTERNAL "" FORCE)
+
-
+# the library directory for using by the executable
-    # Recursively install all depended libraries
+if (NOT INSTALL_VTK)
-    foreach(VTK_TARGET ${VTK_DEPEND})
+  if (WIN32)
-      OCCT_INSTALL_VTK(${VTK_TARGET})
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
-    endforeach()
+  else()
-  endif()
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
-endmacro()
+  endif()
-
+endif()
-if (NOT BUILD_SHARED_LIBS)
+
-  OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_DLL_DIR)
+OCCT_CHECK_AND_UNSET (VTK_INCLUDE_DIRS)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_LIBRARY_DIR)
+OCCT_CHECK_AND_UNSET (VTK_LIBRARY_DIRS)
-  OCCT_CHECK_AND_UNSET(INSTALL_VTK)
+OCCT_CHECK_AND_UNSET (VTK_DIR)
-endif()
-
-# the library directory for using by the executable
-if (NOT INSTALL_VTK)
-  if (WIN32)
-    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
-  else()
-    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
-  endif()
-endif()
-
-OCCT_CHECK_AND_UNSET (VTK_INCLUDE_DIRS)
-OCCT_CHECK_AND_UNSET (VTK_LIBRARY_DIRS)
-OCCT_CHECK_AND_UNSET (VTK_DIR)

adm/genconf.tcl

@@ -0,0 +1,748 @@
+#!/usr/bin/tclsh
+
+# =======================================================================
+# Created on: 2012-01-26
+# Created by: Kirill GAVRILOV
+# Copyright (c) 2012 OPEN CASCADE SAS
+#
+# This file is part of Open CASCADE Technology software library.
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 2.1 as published
+# by the Free Software Foundation, with special exception defined in the file
+# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+# distribution for complete text of the license and disclaimer of any warranty.
+#
+# Alternatively, this file may be used under the terms of Open CASCADE
+# commercial license or contractual agreement.
+
+# =======================================================================
+# GUI procedure for search of third-party tools and generation of environment
+# customization script
+# =======================================================================
+
+# load tools
+source [file join [file dirname [info script]] genconfdeps.tcl]
+
+# proxy variable for implicit file path normalization
+set PRODUCTS_PATH_INPUT "$::PRODUCTS_PATH"
+
+package require Tk
+
+set aRowIter 0
+set aCheckRowIter 0
+frame .myFrame -padx 5 -pady 5
+pack  .myFrame -fill both -expand 1
+frame .myFrame.myPrjFrame
+frame .myFrame.myVsFrame
+frame .myFrame.myHxxChecks
+frame .myFrame.myChecks
+
+# project file format
+set SYS_PRJFMT_LIST {}
+set SYS_PRJNAME_LIST {}
+if { "$::tcl_platform(platform)" == "windows" } {
+  lappend ::SYS_PRJFMT_LIST "vcxproj"
+  lappend ::SYS_PRJNAME_LIST "Visual Studio (.vcxproj)"
+}
+if { "$tcl_platform(os)" == "Darwin" } {
+  lappend ::SYS_PRJFMT_LIST "xcd"
+  lappend ::SYS_PRJNAME_LIST "XCode (.xcd)"
+}
+lappend ::SYS_PRJFMT_LIST "cbp"
+lappend ::SYS_PRJNAME_LIST "Code Blocks (.cbp)"
+lappend ::SYS_PRJFMT_LIST "pro"
+lappend ::SYS_PRJNAME_LIST "Qt Creator (.pro)"
+
+set aPrjIndex [lsearch $::SYS_PRJFMT_LIST $::PRJFMT]
+set ::PRJNAME [lindex $::SYS_PRJNAME_LIST $aPrjIndex]
+set ::CONFIG "Release"
+
+set SYS_VS_LIST {}
+set SYS_VC_LIST {}
+set SYS_VCVARS_LIST {}
+
+# detect installed Visual Studio 2017+ instances by running vswhere.exe
+if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] && "$res" != "" } {
+  lappend ::SYS_VS_LIST "Visual Studio 2017 (15, toolset v141)"
+  lappend ::SYS_VC_LIST "vc141"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] && "$res" != "" } {
+  lappend ::SYS_VS_LIST "Visual Studio 2017 (15, toolset v141) UWP"
+  lappend ::SYS_VC_LIST "vc141-uwp"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] && "$res" != "" } {
+  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142)"
+  lappend ::SYS_VC_LIST "vc142"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] && "$res" != "" } {
+  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142) UWP"
+  lappend ::SYS_VC_LIST "vc142-uwp"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Component.VC.ClangCL -property installationPath} res] && "$res" != "" } {
+  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset ClangCL)"
+  lappend ::SYS_VC_LIST "vclang"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\Auxiliary\\Build\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[17.0,17.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] && "$res" != "" } {
+  lappend ::SYS_VS_LIST "Visual Studio 2022 (17, toolset v143)"
+  lappend ::SYS_VC_LIST "vc143"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[17.0,17.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] && "$res" != "" } {
+  lappend ::SYS_VS_LIST "Visual Studio 2022 (17, toolset v143) UWP"
+  lappend ::SYS_VC_LIST "vc143-uwp"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[17.0,17.99\]" -latest -requires Microsoft.VisualStudio.Component.VC.ClangCL -property installationPath} res] && "$res" != "" } {
+  lappend ::SYS_VS_LIST "Visual Studio 2022 (17, toolset ClangCL)"
+  lappend ::SYS_VC_LIST "vclang"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+}
+
+# detect installed Visual Studio instances from global environment
+if { [info exists ::env(VS140COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2015 (14, toolset v140)"
+  lappend ::SYS_VC_LIST "vc14"
+  lappend ::SYS_VCVARS_LIST "%VS140COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+
+  lappend ::SYS_VS_LIST "Visual Studio 2015 (14, toolset v140) UWP"
+  lappend ::SYS_VC_LIST "vc14-uwp"
+  lappend ::SYS_VCVARS_LIST "%VS140COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS120COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2013 (12, toolset v120)"
+  lappend ::SYS_VC_LIST "vc12"
+  lappend ::SYS_VCVARS_LIST "%VS120COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS110COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2012 (11, toolset v110)"
+  lappend ::SYS_VC_LIST "vc11"
+  lappend ::SYS_VCVARS_LIST "%VS110COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS100COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2010 (10, toolset v100)"
+  lappend ::SYS_VC_LIST "vc10"
+  lappend ::SYS_VCVARS_LIST "%VS100COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS90COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2008 (9, toolset v90)"
+  lappend ::SYS_VC_LIST "vc9"
+  lappend ::SYS_VCVARS_LIST "%VS90COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS80COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2005 (8, toolset v80)"
+  lappend ::SYS_VC_LIST "vc8"
+  lappend ::SYS_VCVARS_LIST "%VS80COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+lappend ::SYS_VS_LIST "Custom"
+lappend ::SYS_VC_LIST "vcX"
+lappend ::SYS_VCVARS_LIST "%VSXXCOMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+
+set aVcVerIndex [lsearch $::SYS_VC_LIST $::VCVER]
+set ::VSVER  [lindex $::SYS_VS_LIST     $aVcVerIndex]
+if { "$::VCVARS" == "" } {
+  set ::VCVARS [lindex $::SYS_VCVARS_LIST $aVcVerIndex]
+}
+
+proc wokdep:gui:Close {} {
+  # if changed ask
+  exit
+}
+
+proc wokdep:gui:configSuffix {} {
+  if { "$::CONFIG" == "Debug" } {
+    return "D"
+  }
+  return ""
+}
+
+proc wokdep:gui:SwitchConfig {} {
+  set ::PRJFMT [lindex $::SYS_PRJFMT_LIST [.myFrame.myPrjFrame.myPrjCombo current]]
+  set ::VCVER  [lindex $::SYS_VC_LIST     [.myFrame.myVsFrame.myVsCombo current]]
+  set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsFrame.myVsCombo current]]
+
+  set ::CSF_OPT_INC {}
+  set ::CSF_OPT_LIB32 {}
+  set ::CSF_OPT_LIB64 {}
+  set ::CSF_OPT_BIN32 {}
+  set ::CSF_OPT_BIN64 {}
+  set ::CSF_OPT_LIB32D {}
+  set ::CSF_OPT_LIB64D {}
+  set ::CSF_OPT_BIN32D {}
+  set ::CSF_OPT_BIN64D {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:SwitchArch {} {
+  wokdep:gui:Show3264Bitness ::aRowIter
+
+  if { [llength [grid info .myFrame.mySave]] != 0 } {
+    grid forget .myFrame.mySave .myFrame.myClose
+  }
+
+  # Bottom section
+  grid .myFrame.mySave  -row $::aRowIter -column 4 -columnspan 2
+  grid .myFrame.myClose -row $::aRowIter -column 6 -columnspan 2
+}
+
+# update label text and visibility
+font create wokdep:gui:EmptyFont -size -1
+proc wokdep:gui:SetLabelText {theLabel theText} {
+  set aFont TkDefaultFont
+  if { $theText == "" } {
+    set aFont wokdep:gui:EmptyFont
+  }
+  $theLabel configure -text $theText -font $aFont
+}
+
+proc wokdep:gui:UpdateList {} {
+  set anIncErrs   {}
+  set anLib32Errs {}
+  set anLib64Errs {}
+  set anBin32Errs {}
+  set anBin64Errs {}
+  wokdep:SearchTclTk     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  if { "$::HAVE_FREETYPE" == "true" } {
+    wokdep:SearchFreeType anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  wokdep:SearchX11       anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  if { "$::HAVE_GLES2" == "true" } {
+    wokdep:SearchEGL     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+    wokdep:SearchGLES    anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_FREEIMAGE" == "true" } {
+    wokdep:SearchFreeImage anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_FFMPEG" == "true" } {
+    wokdep:SearchFFmpeg  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_OPENVR" == "true" } {
+    wokdep:SearchOpenVR  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_TBB" == "true" } {
+    wokdep:SearchTBB     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+#  if { "$::HAVE_OPENCL" == "true" } {
+#    wokdep:SearchOpenCL  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+#  }
+  if { "$::HAVE_VTK" == "true" } {
+    wokdep:SearchVTK  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+
+  if { "$::HAVE_ZLIB" == "true" } {
+    set aCheckLib "z"
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aCheckLib "zlib"
+    }
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "$aCheckLib" {"zlib"}
+  }
+  if { "$::HAVE_LIBLZMA" == "true" } {
+    set aCheckLib "lzma"
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aCheckLib "liblzma"
+    }
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "liblzma" "lzma.h" "$aCheckLib" {"lzma" "xz"}
+  }
+  if { "$::HAVE_E57" == "true" } {
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "e57" "e57/E57Foundation.h" "E57RefImpl" {"e57"}
+    set aCheckLib "xerces-c"
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aCheckLib "xerces-c_3"
+    }
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "xerces-c" "xercesc/sax2/XMLReaderFactory.hpp" "$aCheckLib" {"xerces"}
+  }
+  if { "$::HAVE_RAPIDJSON" == "true" } {
+    wokdep:SearchRapidJson anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_DRACO" == "true" } {
+    set aDummy {}
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs aDummy aDummy "draco" "draco/compression/decode.h" "draco" {"draco"}
+  }
+
+  if {"$::BUILD_Inspector" == "true" } {
+    set ::CHECK_QT "true"
+  }
+
+  if { "$::CHECK_QT" == "true" } {
+    wokdep:SearchQt     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+
+  if { "$::CHECK_JDK" == "true" } {
+    wokdep:SearchJDK     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+
+  wokdep:gui:SetLabelText .myFrame.myIncErrLbl [join $anIncErrs   "\n"]
+
+  wokdep:gui:SetLabelText .myFrame.myIncErrLbl     [join $anIncErrs   "\n"]
+  wokdep:gui:SetLabelText .myFrame.myLib32_ErrLbl  [join $anLib32Errs "\n"]
+  wokdep:gui:SetLabelText .myFrame.myLib64_ErrLbl  [join $anLib64Errs "\n"]
+  wokdep:gui:SetLabelText .myFrame.myBin32_ErrLbl  [join $anBin32Errs "\n"]
+  wokdep:gui:SetLabelText .myFrame.myBin64_ErrLbl  [join $anBin64Errs "\n"]
+
+  wokdep:gui:SetLabelText .myFrame.myLib32D_ErrLbl [join $anLib32Errs "\n"]
+  wokdep:gui:SetLabelText .myFrame.myLib64D_ErrLbl [join $anLib64Errs "\n"]
+  wokdep:gui:SetLabelText .myFrame.myBin32D_ErrLbl [join $anBin32Errs "\n"]
+  wokdep:gui:SetLabelText .myFrame.myBin64D_ErrLbl [join $anBin64Errs "\n"]
+
+  # merge duplicates
+  set ::CSF_OPT_LIB32  [lsort -unique $::CSF_OPT_LIB32]
+  set ::CSF_OPT_LIB64  [lsort -unique $::CSF_OPT_LIB64]
+  set ::CSF_OPT_BIN32  [lsort -unique $::CSF_OPT_BIN32]
+  set ::CSF_OPT_BIN64  [lsort -unique $::CSF_OPT_BIN64]
+  set ::CSF_OPT_LIB32D [lsort -unique $::CSF_OPT_LIB32D]
+  set ::CSF_OPT_LIB64D [lsort -unique $::CSF_OPT_LIB64D]
+  set ::CSF_OPT_BIN32D [lsort -unique $::CSF_OPT_BIN32D]
+  set ::CSF_OPT_BIN64D [lsort -unique $::CSF_OPT_BIN64D]
+}
+
+proc wokdep:gui:BrowseVcVars {} {
+  set aResult [tk_chooseDirectory -initialdir $::VCVARS -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    set ::VCVARS $aResult
+  }
+}
+
+proc wokdep:gui:BrowsePartiesRoot {} {
+  set aResult [tk_chooseDirectory -initialdir $::PRODUCTS_PATH_INPUT -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    set ::PRODUCTS_PATH_INPUT $aResult
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:AddIncPath {} {
+  set aResult [tk_chooseDirectory -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    lappend ::CSF_OPT_INC "$aResult"
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:AddLibPath {} {
+  set aCfg [wokdep:gui:configSuffix]
+  set aResult [tk_chooseDirectory -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    lappend ::CSF_OPT_LIB${::ARCH}${aCfg} "$aResult"
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:AddBinPath {} {
+  set aCfg [wokdep:gui:configSuffix]
+  set aResult [tk_chooseDirectory -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    lappend ::CSF_OPT_BIN${::ARCH}${aCfg} "$aResult"
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:RemoveIncPath {} {
+  set aSelIndices [.myFrame.myIncList curselection]
+  if { [llength $aSelIndices] != 0 } {
+    .myFrame.myIncList delete [lindex $aSelIndices 0]
+  }
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:RemoveLibPath {} {
+  set aCfg [wokdep:gui:configSuffix]
+  set aSelIndices [.myFrame.myLib${::ARCH}${aCfg}_List curselection]
+  if { [llength $aSelIndices] != 0 } {
+    .myFrame.myLib${::ARCH}${aCfg}_List delete [lindex $aSelIndices 0]
+  }
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:RemoveBinPath {} {
+  set aCfg [wokdep:gui:configSuffix]
+  set aSelIndices [.myFrame.myBin${::ARCH}${aCfg}_List curselection]
+  if { [llength $aSelIndices] != 0 } {
+    .myFrame.myBin${::ARCH}${aCfg}_List delete [lindex $aSelIndices 0]
+  }
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:ResetIncPath {} {
+  set ::CSF_OPT_INC {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:ResetLibPath {} {
+  set ::CSF_OPT_LIB${::ARCH}  {}
+  set ::CSF_OPT_LIB${::ARCH}D {}
+  set ::CSF_OPT_BIN${::ARCH}  {}
+  set ::CSF_OPT_BIN${::ARCH}D {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:Show3264Bitness { theRowIter } {
+  upvar $theRowIter aRowIter
+
+  set aArchOld ""
+  set aCfg [wokdep:gui:configSuffix]
+  if { "$::ARCH" == "32" } {
+    set aArchOld "64"
+  } else {
+    set aArchOld "32"
+  }
+
+  set aCfgOld "D"
+  if { "$::CONFIG" == "Debug" } { set aCfgOld "" }
+  set aDelArch ${aArchOld}${aCfg}
+  if { [llength [grid info .myFrame.myLib${aDelArch}_Lbl]] != 0 } {
+    grid forget .myFrame.myLib${aDelArch}_Lbl .myFrame.myLib${aDelArch}_List   .myFrame.myLib${aDelArch}_Scrl
+    grid forget .myFrame.myLib${aDelArch}_Add .myFrame.myLib${aDelArch}_Remove .myFrame.myLib${aDelArch}_Clear .myFrame.myLib${aDelArch}_ErrLbl
+    grid forget .myFrame.myBin${aDelArch}_Lbl .myFrame.myBin${aDelArch}_List   .myFrame.myBin${aDelArch}_Scrl
+    grid forget .myFrame.myBin${aDelArch}_Add .myFrame.myBin${aDelArch}_Remove .myFrame.myBin${aDelArch}_Clear .myFrame.myBin${aDelArch}_ErrLbl
+  }
+  set aDelCfg ${::ARCH}${aCfgOld}
+  if { [llength [grid info .myFrame.myLib${aDelCfg}_Lbl]] != 0 } {
+    grid forget .myFrame.myLib${aDelCfg}_Lbl .myFrame.myLib${aDelCfg}_List   .myFrame.myLib${aDelCfg}_Scrl
+    grid forget .myFrame.myLib${aDelCfg}_Add .myFrame.myLib${aDelCfg}_Remove .myFrame.myLib${aDelCfg}_Clear .myFrame.myLib${aDelCfg}_ErrLbl
+    grid forget .myFrame.myBin${aDelCfg}_Lbl .myFrame.myBin${aDelCfg}_List   .myFrame.myBin${aDelCfg}_Scrl
+    grid forget .myFrame.myBin${aDelCfg}_Add .myFrame.myBin${aDelCfg}_Remove .myFrame.myBin${aDelCfg}_Clear .myFrame.myBin${aDelCfg}_ErrLbl
+  }
+
+  set aNewCfg ${::ARCH}${aCfg}
+  # Additional libraries search paths
+  grid .myFrame.myLib${aNewCfg}_Lbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+  grid .myFrame.myLib${aNewCfg}_List   -row $aRowIter -column 0 -rowspan 4 -columnspan 5
+  grid .myFrame.myLib${aNewCfg}_Scrl   -row $aRowIter -column 5 -rowspan 4
+  grid .myFrame.myLib${aNewCfg}_Add    -row $aRowIter -column 6
+  incr aRowIter
+  #grid .myFrame.myLib${aNewCfg}_Edit   -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib${aNewCfg}_Remove -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib${aNewCfg}_Clear  -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib${aNewCfg}_ErrLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+
+  # Additional executables search paths
+  grid .myFrame.myBin${aNewCfg}_Lbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+  grid .myFrame.myBin${aNewCfg}_List   -row $aRowIter -column 0 -rowspan 4 -columnspan 5
+  grid .myFrame.myBin${aNewCfg}_Scrl   -row $aRowIter -column 5 -rowspan 4
+  grid .myFrame.myBin${aNewCfg}_Add    -row $aRowIter -column 6
+  incr aRowIter
+  #grid .myFrame.myBin${aNewCfg}_Edit   -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin${aNewCfg}_Remove -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin${aNewCfg}_Clear  -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin${aNewCfg}_ErrLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+}
+
+# Header
+ttk::label    .myFrame.myPrjFrame.myPrjLbl     -text "Project format:" -padding {5 5 20 5}
+ttk::combobox .myFrame.myPrjFrame.myPrjCombo   -values $SYS_PRJNAME_LIST -state readonly -textvariable PRJNAME -width 40
+ttk::label    .myFrame.myVsFrame.myVsLbl       -text "Visual Studio configuration:" -padding {5 5 20 5}
+ttk::combobox .myFrame.myVsFrame.myVsCombo     -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 40
+ttk::combobox .myFrame.myVsFrame.myArchCombo   -values { {32} {64} } -textvariable ARCH -state readonly -width 6
+ttk::combobox .myFrame.myVsFrame.myConfigCombo -values { {Release} {Debug} } -textvariable CONFIG -state readonly -width 6
+entry         .myFrame.myVcEntry     -textvariable VCVER  -width 10
+entry         .myFrame.myVcVarsEntry -textvariable VCVARS -width 70
+ttk::button   .myFrame.myVcBrowseBtn -text "Browse" -command wokdep:gui:BrowseVcVars
+ttk::label    .myFrame.myHxxChecks.myRelDebInfoLbl   -text "Release with Debug info"
+checkbutton   .myFrame.myHxxChecks.myRelDebInfoCheck -offvalue "false" -onvalue "true" -variable HAVE_RelWithDebInfo
+
+#
+ttk::combobox .myFrame.myHxxChecks.myScutsCombo   -values { {ShortCut} {Copy} {HardLink} } -textvariable SHORTCUT_HEADERS -state readonly -width 12
+ttk::label    .myFrame.myHxxChecks.myScutsLbl     -text "Strategy for filling headers folder inc:"
+
+#
+ttk::label    .myFrame.mySrchLbl       -text "3rd-parties search path:" -padding {5 5 80 5}
+entry         .myFrame.mySrchEntry     -textvariable PRODUCTS_PATH_INPUT -width 80
+ttk::button   .myFrame.mySrchBrowseBtn -text "Browse" -command wokdep:gui:BrowsePartiesRoot
+checkbutton   .myFrame.myChecks.myFreeTypeCheck -offvalue "false" -onvalue "true" -variable HAVE_FREETYPE  -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myFreeTypeLbl   -text "Use FreeType"
+checkbutton   .myFrame.myChecks.myFImageCheck   -offvalue "false" -onvalue "true" -variable HAVE_FREEIMAGE -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myFImageLbl     -text "Use FreeImage"
+checkbutton   .myFrame.myChecks.myTbbCheck      -offvalue "false" -onvalue "true" -variable HAVE_TBB       -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myTbbLbl        -text "Use Intel TBB"
+checkbutton   .myFrame.myChecks.myOpenVrCheck   -offvalue "false" -onvalue "true" -variable HAVE_OPENVR    -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myOpenVrLbl     -text "Use OpenVR"
+if { "$::tcl_platform(os)" != "Darwin" } {
+  checkbutton .myFrame.myChecks.myGlesCheck     -offvalue "false" -onvalue "true" -variable HAVE_GLES2     -command wokdep:gui:UpdateList
+  ttk::label  .myFrame.myChecks.myGlesLbl       -text "Use OpenGL ES"
+}
+if { "$::tcl_platform(platform)" == "windows" } {
+  checkbutton .myFrame.myChecks.myD3dCheck      -offvalue "false" -onvalue "true" -variable HAVE_D3D       -command wokdep:gui:UpdateList
+  ttk::label  .myFrame.myChecks.myD3dLbl        -text "Use Direct3D"
+}
+checkbutton   .myFrame.myChecks.myFFmpegCheck   -offvalue "false" -onvalue "true" -variable HAVE_FFMPEG    -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myFFmpegLbl     -text "Use FFmpeg"
+#checkbutton   .myFrame.myChecks.myOpenClCheck   -offvalue "false" -onvalue "true" -variable HAVE_OPENCL    -command wokdep:gui:UpdateList
+#ttk::label    .myFrame.myChecks.myOpenClLbl     -text "Use OpenCL"
+checkbutton   .myFrame.myChecks.myRapidJsonCheck -offvalue "false" -onvalue "true" -variable HAVE_RAPIDJSON -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myRapidJsonLbl   -text "Use RapidJSON"
+checkbutton   .myFrame.myChecks.myDracoCheck    -offvalue "false" -onvalue "true" -variable HAVE_DRACO     -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myDracoLbl      -text "Use Draco"
+
+checkbutton   .myFrame.myChecks.myXLibCheck     -offvalue "false" -onvalue "true" -variable HAVE_XLIB
+ttk::label    .myFrame.myChecks.myXLibLbl       -text "Use X11 for windows drawing"
+ttk::label    .myFrame.myChecks.myVtkLbl        -text "Use VTK"
+checkbutton   .myFrame.myChecks.myVtkCheck      -offvalue "false" -onvalue "true" -variable HAVE_VTK       -command wokdep:gui:UpdateList
+
+checkbutton   .myFrame.myChecks.myZLibCheck     -offvalue "false" -onvalue "true" -variable HAVE_ZLIB      -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myZLibLbl       -text "Use zlib"
+checkbutton   .myFrame.myChecks.myLzmaCheck     -offvalue "false" -onvalue "true" -variable HAVE_LIBLZMA   -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myLzmaLbl       -text "Use liblzma"
+checkbutton   .myFrame.myChecks.myE57Check      -offvalue "false" -onvalue "true" -variable HAVE_E57       -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myE57Lbl        -text "Use E57"
+
+checkbutton   .myFrame.myChecks.myQtCheck       -offvalue "false" -onvalue "true" -variable CHECK_QT       -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myQtLbl         -text "Search Qt"
+checkbutton   .myFrame.myChecks.myJDKCheck      -offvalue "false" -onvalue "true" -variable CHECK_JDK      -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myJDKLbl        -text "Search JDK"
+
+if { "$::tcl_platform(platform)" == "windows" } {
+  checkbutton   .myFrame.myChecks.myInspectorBuild -offvalue "false" -onvalue "true" -variable BUILD_Inspector      -command wokdep:gui:UpdateList
+  ttk::label    .myFrame.myChecks.myInspectorLbl   -text "Build Inspector"
+}
+
+# Additional headers search paths
+ttk::label    .myFrame.myIncLbl    -text "Additional headers search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myIncScrl   -command ".myFrame.myIncList yview"
+listbox       .myFrame.myIncList   -listvariable CSF_OPT_INC -width 80 -height 5 -yscrollcommand ".myFrame.myIncScrl set"
+ttk::button   .myFrame.myIncAdd    -text "Add"     -command wokdep:gui:AddIncPath
+ttk::button   .myFrame.myIncEdit   -text "Edit"
+ttk::button   .myFrame.myIncRemove -text "Remove"  -command wokdep:gui:RemoveIncPath
+ttk::button   .myFrame.myIncClear  -text "Reset"   -command wokdep:gui:ResetIncPath
+ttk::label    .myFrame.myIncErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional libraries (32-bit) search paths
+ttk::label    .myFrame.myLib32_Lbl    -text "Additional libraries (32-bit) search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myLib32_Scrl   -command ".myFrame.myLib32_List yview"
+listbox       .myFrame.myLib32_List   -listvariable CSF_OPT_LIB32 -width 80 -height 5 -yscrollcommand ".myFrame.myLib32_Scrl set"
+ttk::button   .myFrame.myLib32_Add    -text "Add"     -command wokdep:gui:AddLibPath
+ttk::button   .myFrame.myLib32_Edit   -text "Edit"
+ttk::button   .myFrame.myLib32_Remove -text "Remove"  -command wokdep:gui:RemoveLibPath
+ttk::button   .myFrame.myLib32_Clear  -text "Reset"   -command wokdep:gui:ResetLibPath
+ttk::label    .myFrame.myLib32_ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional debug libraries (32-bit) search paths
+ttk::label    .myFrame.myLib32D_Lbl    -text "Additional debug libraries (32-bit) search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myLib32D_Scrl   -command ".myFrame.myLib32D_List yview"
+listbox       .myFrame.myLib32D_List   -listvariable CSF_OPT_LIB32D -width 80 -height 5 -yscrollcommand ".myFrame.myLib32D_Scrl set"
+ttk::button   .myFrame.myLib32D_Add    -text "Add"     -command wokdep:gui:AddLibPath
+ttk::button   .myFrame.myLib32D_Edit   -text "Edit"
+ttk::button   .myFrame.myLib32D_Remove -text "Remove"  -command wokdep:gui:RemoveLibPath
+ttk::button   .myFrame.myLib32D_Clear  -text "Reset"   -command wokdep:gui:ResetLibPath
+ttk::label    .myFrame.myLib32D_ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional libraries (64-bit) search paths
+ttk::label    .myFrame.myLib64_Lbl    -text "Additional libraries (64-bit) search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myLib64_Scrl   -command ".myFrame.myLib64_List yview"
+listbox       .myFrame.myLib64_List   -listvariable CSF_OPT_LIB64 -width 80 -height 5 -yscrollcommand ".myFrame.myLib64_Scrl set"
+ttk::button   .myFrame.myLib64_Add    -text "Add"     -command wokdep:gui:AddLibPath
+ttk::button   .myFrame.myLib64_Edit   -text "Edit"
+ttk::button   .myFrame.myLib64_Remove -text "Remove"  -command wokdep:gui:RemoveLibPath
+ttk::button   .myFrame.myLib64_Clear  -text "Reset"   -command wokdep:gui:ResetLibPath
+ttk::label    .myFrame.myLib64_ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional debug libraries (64-bit) search paths
+ttk::label    .myFrame.myLib64D_Lbl    -text "Additional debug libraries (64-bit) search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myLib64D_Scrl   -command ".myFrame.myLib64D_List yview"
+listbox       .myFrame.myLib64D_List   -listvariable CSF_OPT_LIB64D -width 80 -height 5 -yscrollcommand ".myFrame.myLib64D_Scrl set"
+ttk::button   .myFrame.myLib64D_Add    -text "Add"     -command wokdep:gui:AddLibPath
+ttk::button   .myFrame.myLib64D_Edit   -text "Edit"
+ttk::button   .myFrame.myLib64D_Remove -text "Remove"  -command wokdep:gui:RemoveLibPath
+ttk::button   .myFrame.myLib64D_Clear  -text "Reset"   -command wokdep:gui:ResetLibPath
+ttk::label    .myFrame.myLib64D_ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional executables (32-bit) search paths
+ttk::label    .myFrame.myBin32_Lbl    -text "Additional executables (32-bit) search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myBin32_Scrl   -command ".myFrame.myBin32_List yview"
+listbox       .myFrame.myBin32_List   -listvariable CSF_OPT_BIN32 -width 80 -height 5 -yscrollcommand ".myFrame.myBin32_Scrl set"
+ttk::button   .myFrame.myBin32_Add    -text "Add"     -command wokdep:gui:AddBinPath
+ttk::button   .myFrame.myBin32_Edit   -text "Edit"
+ttk::button   .myFrame.myBin32_Remove -text "Remove"  -command wokdep:gui:RemoveBinPath
+ttk::button   .myFrame.myBin32_Clear  -text "Reset"   -command wokdep:gui:ResetLibPath
+ttk::label    .myFrame.myBin32_ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional debug executables (32-bit) search paths
+ttk::label    .myFrame.myBin32D_Lbl    -text "Additional debug executables (32-bit) search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myBin32D_Scrl   -command ".myFrame.myBin32D_List yview"
+listbox       .myFrame.myBin32D_List   -listvariable CSF_OPT_BIN32D -width 80 -height 5 -yscrollcommand ".myFrame.myBin32D_Scrl set"
+ttk::button   .myFrame.myBin32D_Add    -text "Add"     -command wokdep:gui:AddBinPath
+ttk::button   .myFrame.myBin32D_Edit   -text "Edit"
+ttk::button   .myFrame.myBin32D_Remove -text "Remove"  -command wokdep:gui:RemoveBinPath
+ttk::button   .myFrame.myBin32D_Clear  -text "Reset"   -command wokdep:gui:ResetLibPath
+ttk::label    .myFrame.myBin32D_ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional executables (64-bit) search paths
+ttk::label    .myFrame.myBin64_Lbl    -text "Additional executables (64-bit) search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myBin64_Scrl   -command ".myFrame.myBin64_List yview"
+listbox       .myFrame.myBin64_List   -listvariable CSF_OPT_BIN64 -width 80 -height 5 -yscrollcommand ".myFrame.myBin64_Scrl set"
+ttk::button   .myFrame.myBin64_Add    -text "Add"     -command wokdep:gui:AddBinPath
+ttk::button   .myFrame.myBin64_Edit   -text "Edit"
+ttk::button   .myFrame.myBin64_Remove -text "Remove"  -command wokdep:gui:RemoveBinPath
+ttk::button   .myFrame.myBin64_Clear  -text "Reset"   -command wokdep:gui:ResetLibPath
+ttk::label    .myFrame.myBin64_ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional debug executables (64-bit) search paths
+ttk::label    .myFrame.myBin64D_Lbl    -text "Additional debug executables (64-bit) search paths:" -padding {5 5 80 5}
+scrollbar     .myFrame.myBin64D_Scrl   -command ".myFrame.myBin64D_List yview"
+listbox       .myFrame.myBin64D_List   -listvariable CSF_OPT_BIN64D -width 80 -height 5 -yscrollcommand ".myFrame.myBin64D_Scrl set"
+ttk::button   .myFrame.myBin64D_Add    -text "Add"     -command wokdep:gui:AddBinPath
+ttk::button   .myFrame.myBin64D_Edit   -text "Edit"
+ttk::button   .myFrame.myBin64D_Remove -text "Remove"  -command wokdep:gui:RemoveBinPath
+ttk::button   .myFrame.myBin64D_Clear  -text "Reset"   -command wokdep:gui:ResetLibPath
+ttk::label    .myFrame.myBin64D_ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Bottom
+ttk::button   .myFrame.mySave  -text "Save"  -command wokdep:SaveCustom
+ttk::button   .myFrame.myClose -text "Close" -command wokdep:gui:Close
+
+# Create grid
+# Header
+grid .myFrame.myPrjFrame            -row $aRowIter -column 0 -columnspan 10 -sticky w
+grid .myFrame.myPrjFrame.myPrjLbl   -row 0 -column 0
+grid .myFrame.myPrjFrame.myPrjCombo -row 0 -column 1
+if { "$tcl_platform(platform)" == "windows" } {
+  incr aRowIter
+  grid .myFrame.myVsFrame               -row $aRowIter -column 0 -columnspan 10 -sticky w
+  grid .myFrame.myVsFrame.myVsLbl       -row 0 -column 0
+  grid .myFrame.myVsFrame.myVsCombo     -row 0 -column 1 -padx 5
+  grid .myFrame.myVsFrame.myArchCombo   -row 0 -column 2
+  grid .myFrame.myVsFrame.myConfigCombo -row 0 -column 3
+  incr aRowIter
+  grid .myFrame.myVcEntry     -row $aRowIter -column 0
+  grid .myFrame.myVcVarsEntry -row $aRowIter -column 1 -columnspan 4 -sticky w
+  grid .myFrame.myVcBrowseBtn -row $aRowIter -column 6
+  incr aRowIter
+} else {
+  grid .myFrame.myVsFrame               -row $aRowIter -column 4 -sticky w
+  grid .myFrame.myVsFrame.myConfigCombo -row 0 -column 0
+  incr aRowIter
+}
+
+#
+grid .myFrame.myHxxChecks -row $aRowIter -column 0 -columnspan 10 -sticky w
+grid .myFrame.myHxxChecks.myScutsLbl     -row 0 -column 0
+grid .myFrame.myHxxChecks.myScutsCombo   -row 0 -column 1
+if { "$tcl_platform(platform)" == "windows" } {
+  grid .myFrame.myHxxChecks.myRelDebInfoCheck -row 0 -column 2
+  grid .myFrame.myHxxChecks.myRelDebInfoLbl   -row 0 -column 3
+}
+incr aRowIter
+#
+grid .myFrame.mySrchLbl       -row $aRowIter -column 0 -columnspan 10 -sticky w
+incr aRowIter
+grid .myFrame.mySrchEntry     -row $aRowIter -column 0 -columnspan 5
+grid .myFrame.mySrchBrowseBtn -row $aRowIter -column 6
+incr aRowIter
+
+grid .myFrame.myChecks        -row $aRowIter -column 0 -columnspan 10 -sticky w
+incr aRowIter
+grid .myFrame.myChecks.myFreeTypeCheck  -row $aCheckRowIter -column 0 -sticky e
+grid .myFrame.myChecks.myFreeTypeLbl    -row $aCheckRowIter -column 1 -sticky w
+grid .myFrame.myChecks.myRapidJsonCheck -row $aCheckRowIter -column 2 -sticky e
+grid .myFrame.myChecks.myRapidJsonLbl   -row $aCheckRowIter -column 3 -sticky w
+if { "$::tcl_platform(os)" != "Darwin" } {
+  grid .myFrame.myChecks.myGlesCheck     -row $aCheckRowIter -column 4 -sticky e
+  grid .myFrame.myChecks.myGlesLbl       -row $aCheckRowIter -column 5 -sticky w
+}
+#grid .myFrame.myChecks.myOpenClCheck   -row $aCheckRowIter -column 6 -sticky e
+#grid .myFrame.myChecks.myOpenClLbl     -row $aCheckRowIter -column 7 -sticky w
+grid .myFrame.myChecks.myZLibCheck     -row $aCheckRowIter -column 6 -sticky e
+grid .myFrame.myChecks.myZLibLbl       -row $aCheckRowIter -column 7 -sticky w
+
+grid .myFrame.myChecks.myQtCheck      -row $aCheckRowIter -column 12 -sticky e
+grid .myFrame.myChecks.myQtLbl        -row $aCheckRowIter -column 13 -sticky w
+
+incr aCheckRowIter
+grid .myFrame.myChecks.myFImageCheck   -row $aCheckRowIter -column 0 -sticky e
+grid .myFrame.myChecks.myFImageLbl     -row $aCheckRowIter -column 1 -sticky w
+grid .myFrame.myChecks.myDracoCheck    -row $aCheckRowIter -column 2 -sticky e
+grid .myFrame.myChecks.myDracoLbl      -row $aCheckRowIter -column 3 -sticky w
+
+if { "$::tcl_platform(platform)" == "windows" } {
+  grid .myFrame.myChecks.myD3dCheck    -row $aCheckRowIter -column 4 -sticky e
+  grid .myFrame.myChecks.myD3dLbl      -row $aCheckRowIter -column 5 -sticky w
+} else {
+  grid .myFrame.myChecks.myXLibCheck   -row $aCheckRowIter -column 4 -sticky e
+  grid .myFrame.myChecks.myXLibLbl     -row $aCheckRowIter -column 5 -sticky w
+}
+grid .myFrame.myChecks.myLzmaCheck     -row $aCheckRowIter -column 6 -sticky e
+grid .myFrame.myChecks.myLzmaLbl       -row $aCheckRowIter -column 7 -sticky w
+grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 12 -sticky e
+grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 13 -sticky w
+
+incr aCheckRowIter
+grid .myFrame.myChecks.myFFmpegCheck   -row $aCheckRowIter -column 0 -sticky e
+grid .myFrame.myChecks.myFFmpegLbl     -row $aCheckRowIter -column 1 -sticky w
+grid .myFrame.myChecks.myVtkCheck      -row $aCheckRowIter -column 2 -sticky e
+grid .myFrame.myChecks.myVtkLbl        -row $aCheckRowIter -column 3 -sticky w
+grid .myFrame.myChecks.myOpenVrCheck   -row $aCheckRowIter -column 4 -sticky e
+grid .myFrame.myChecks.myOpenVrLbl     -row $aCheckRowIter -column 5 -sticky w
+grid .myFrame.myChecks.myE57Check      -row $aCheckRowIter -column 6 -sticky e
+grid .myFrame.myChecks.myE57Lbl        -row $aCheckRowIter -column 7 -sticky w
+
+if { "$::tcl_platform(platform)" == "windows" } {
+  grid .myFrame.myChecks.myInspectorBuild      -row $aCheckRowIter -column 12 -sticky e
+  grid .myFrame.myChecks.myInspectorLbl        -row $aCheckRowIter -column 13 -sticky w
+}
+
+incr aCheckRowIter
+
+grid .myFrame.myChecks.myTbbCheck      -row $aCheckRowIter -column 12 -sticky e
+grid .myFrame.myChecks.myTbbLbl        -row $aCheckRowIter -column 13 -sticky w
+
+incr aCheckRowIter
+
+# Additional headers search paths
+grid .myFrame.myIncLbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
+incr aRowIter
+grid .myFrame.myIncList   -row $aRowIter -column 0 -rowspan 4 -columnspan 5
+grid .myFrame.myIncScrl   -row $aRowIter -column 5 -rowspan 4
+grid .myFrame.myIncAdd    -row $aRowIter -column 6
+incr aRowIter
+#grid .myFrame.myIncEdit   -row $aRowIter -column 6
+incr aRowIter
+grid .myFrame.myIncRemove -row $aRowIter -column 6
+incr aRowIter
+grid .myFrame.myIncClear  -row $aRowIter -column 6
+incr aRowIter
+grid .myFrame.myIncErrLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+incr aRowIter
+
+# Additional search paths
+wokdep:gui:Show3264Bitness aRowIter
+
+# Bottom section
+grid .myFrame.mySave  -row $aRowIter -column 4 -columnspan 2
+grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2
+
+# Bind events
+bind .myFrame.myPrjFrame.myPrjCombo <<ComboboxSelected>> {
+  wokdep:gui:SwitchConfig
+}
+bind .myFrame.myVsFrame.myVsCombo <<ComboboxSelected>> {
+  wokdep:gui:SwitchConfig
+}
+bind .myFrame.myVsFrame.myArchCombo <<ComboboxSelected>> {
+  wokdep:gui:SwitchArch
+}
+bind .myFrame.myVsFrame.myConfigCombo <<ComboboxSelected>> {
+  wokdep:gui:SwitchArch
+}
+
+.myFrame.mySrchEntry configure -validate all -validatecommand {
+  set ::PRODUCTS_PATH [file normalize "$::PRODUCTS_PATH_INPUT"]
+  #return [file exists "$::PRODUCTS_PATH"]
+  wokdep:gui:UpdateList
+  return 1
+}
+
+wokdep:gui:UpdateList

adm/qmake/.gitignore

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

adm/qmake/OccCppConfig.pri

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

adm/qmake/OccModule.pri

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

adm/qmake/OccModule.pro.in

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

adm/qmake/OccToolkit.pri

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

adm/qmake/OccToolkit.pro.in

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

adm/qmake/Occt.pro

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

adm/qmake/OcctHeaderLink.hxx.in

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

adm/qmake/custom.pri.template

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

adm/qmake/qtcreator-occt-cpp.xml

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

adm/scripts/android_build.bat

@@ -33,7 +33,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"
 
 rem Optional 3rd-party libraries to enable
 set "USE_FREETYPE=ON"
@@ -167,7 +166,6 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="OFF" ^
  -D BUILD_MODULE_Draw:BOOL="OFF" ^
  -D BUILD_DOC_Overview:BOOL="OFF" ^
  -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^

adm/scripts/android_custom.bat.template

@@ -1,34 +1,33 @@
-rem Environment configuration template for android_build.bat (to be renamed as android_custom.bat)
+rem Environment configuration template for android_build.bat (to be renamed as android_custom.bat)
-
+
-rem Paths to 3rd-party tools and libraries
+rem Paths to 3rd-party tools and libraries
-rem call c:\TDM-GCC-64\mingwvars.bat
+rem call c:\TDM-GCC-64\mingwvars.bat
-rem set "PATH=c:\CMake\bin;%PATH%"
+rem set "PATH=c:\CMake\bin;%PATH%"
-rem set "anNdkPath=c:/android-ndk-r12"
+rem set "anNdkPath=c:/android-ndk-r12"
-rem set "aFreeType=c:/freetype-2.7.1-android"
+rem set "aFreeType=c:/freetype-2.7.1-android"
-rem set "aRapidJson=c:/rapidjson-1.1.0"
+rem set "aRapidJson=c:/rapidjson-1.1.0"
-rem set "aDraco=c:/draco-1.4.1-android"
+rem set "aDraco=c:/draco-1.4.1-android"
-
+
-rem Uncomment to customize building steps
+rem Uncomment to customize building steps
-rem set "aBuildRoot=%~dp0..\..\work"
+rem set "aBuildRoot=%~dp0..\..\work"
-rem set "toCMake=1"
+rem set "toCMake=1"
-rem set "toClean=0"
+rem set "toClean=0"
-rem set "toMake=1"
+rem set "toMake=1"
-rem set "toInstall=1"
+rem set "toInstall=1"
-rem set "toPack=1"
+rem set "toPack=1"
-rem set "isStatic=0"
+rem set "isStatic=0"
-
+
-rem Minimal Android platform and CPU architectures
+rem Minimal Android platform and CPU architectures
-rem set "anNdkApiLevel=21"
+rem set "anNdkApiLevel=21"
-rem set "anNdkAbiList=arm64-v8a x86_64"
+rem set "anNdkAbiList=arm64-v8a x86_64"
-
+
-rem OCCT Modules to build
+rem OCCT Modules to build
-rem set "BUILD_ModelingData=ON"
+rem set "BUILD_ModelingData=ON"
-rem set "BUILD_ModelingAlgorithms=ON"
+rem set "BUILD_ModelingAlgorithms=ON"
-rem set "BUILD_Visualization=ON"
+rem set "BUILD_Visualization=ON"
-rem set "BUILD_ApplicationFramework=ON"
+rem set "BUILD_ApplicationFramework=ON"
-rem set "BUILD_DataExchange=ON"
+rem set "BUILD_DataExchange=ON"
-rem set "BUILD_MODULE_DETools=OFF"
+
-
+rem Optional 3rd-party libraries to enable
-rem Optional 3rd-party libraries to enable
+rem set "USE_RAPIDJSON=ON"
-rem set "USE_RAPIDJSON=ON"
+rem set "USE_DRACO=ON"
-rem set "USE_DRACO=ON"

adm/scripts/cmake_custom.bat.template

@@ -1,49 +1,48 @@
-rem Environment configuration template for cmake_gen.bat (to be renamed as cmake_gen_custom.bat)
+rem Environment configuration template for cmake_gen.bat (to be renamed as cmake_gen_custom.bat)
-
+
-set "OCCT3RDPARTY=%SrcRoot%\..\3rdparty"
+set "OCCT3RDPARTY=%SrcRoot%\..\3rdparty"
-
+
-set VS=14
+set VS=14
-set VSDATA=2015
+set VSDATA=2015
-
+
-rem Leave VSPLATFORM empty to build for x86 platform
+rem Leave VSPLATFORM empty to build for x86 platform
-set VSPLATFORM=Win64
+set VSPLATFORM=Win64
-
+
-rem ------------------------------------
+rem ------------------------------------
-rem Uncomment to customize building steps
+rem Uncomment to customize building steps
-rem ------------------------------------
+rem ------------------------------------
-
+
-rem set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%"
+rem set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%"
-rem set "INSTALL_DIR=%SrcRoot%\install"
+rem set "INSTALL_DIR=%SrcRoot%\install"
-
+
-rem set BUILD_DOC_Overview=OFF
+rem set BUILD_DOC_Overview=OFF
-rem set BUILD_Inspector=OFF
+rem set BUILD_Inspector=OFF
-rem set BUILD_LIBRARY_TYPE=Shared
+rem set BUILD_LIBRARY_TYPE=Shared
-rem set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
+rem set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
-rem set BUILD_WITH_DEBUG=OFF
+rem set BUILD_WITH_DEBUG=OFF
-rem set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
+rem set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
-rem set BUILD_USE_PCH=OFF
+rem set BUILD_USE_PCH=OFF
-rem set BUILD_FORCE_RelWithDebInfo=OFF
+rem set BUILD_FORCE_RelWithDebInfo=OFF
-
+
-rem Use semicolon-separated list of toolkits if you want to disable all modules
+rem Use semicolon-separated list of toolkits if you want to disable all modules
-rem  and build only some toolkits.
+rem  and build only some toolkits.
-rem set BUILD_ADDITIONAL_TOOLKITS=
+rem set BUILD_ADDITIONAL_TOOLKITS=
-
+
-rem Set a directory recognized as a patch for OCCT.
+rem Set a directory recognized as a patch for OCCT.
-rem set BUILD_PATCH=
+rem set BUILD_PATCH=
-
+
-rem set BUILD_MODULE_ApplicationFramework=ON
+rem set BUILD_MODULE_ApplicationFramework=ON
-rem set BUILD_MODULE_DataExchange=ON
+rem set BUILD_MODULE_DataExchange=ON
-rem set BUILD_MODULE_DETools=OFF
+rem set BUILD_MODULE_Draw=ON
-rem set BUILD_MODULE_Draw=ON
+rem set BUILD_MODULE_ModelingAlgorithms=ON
-rem set BUILD_MODULE_ModelingAlgorithms=ON
+rem set BUILD_MODULE_ModelingData=ON
-rem set BUILD_MODULE_ModelingData=ON
+rem set BUILD_MODULE_Visualization=ON
-rem set BUILD_MODULE_Visualization=ON
+
-
+rem set USE_D3D=OFF
-rem set USE_D3D=OFF
+rem set USE_FFMPEG=OFF
-rem set USE_FFMPEG=OFF
+rem set USE_FREEIMAGE=OFF
-rem set USE_FREEIMAGE=OFF
+rem set USE_GLES2=OFF
-rem set USE_GLES2=OFF
+rem set USE_RAPIDJSON=OFF
-rem set USE_RAPIDJSON=OFF
+rem set USE_DRACO=OFF
-rem set USE_DRACO=OFF
+rem set USE_TBB=OFF
-rem set USE_TBB=OFF
+rem set USE_VTK=OFF
-rem set USE_VTK=OFF

adm/scripts/cmake_custom.sh.template

@@ -1,44 +1,43 @@
-# Environment configuration template for cmake_gen.sh (to be renamed as cmake_gen_custom.sh)
+# Environment configuration template for cmake_gen.sh (to be renamed as cmake_gen_custom.sh)
-
+
-OCCT3RDPARTY="$SrcRoot/../3rdparty"
+OCCT3RDPARTY="$SrcRoot/../3rdparty"
-FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
+FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
-
+
-# ------------------------------------
+# ------------------------------------
-# Uncomment to customize building steps
+# Uncomment to customize building steps
-# ------------------------------------
+# ------------------------------------
-
+
-#BUILD_DIR=build
+#BUILD_DIR=build
-#INSTALL_DIR="$SrcRoot/install"
+#INSTALL_DIR="$SrcRoot/install"
-
+
-#BUILD_DOC_Overview=OFF
+#BUILD_DOC_Overview=OFF
-#BUILD_Inspector=OFF
+#BUILD_Inspector=OFF
-#BUILD_LIBRARY_TYPE=Shared
+#BUILD_LIBRARY_TYPE=Shared
-#BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
+#BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
-#BUILD_WITH_DEBUG=OFF
+#BUILD_WITH_DEBUG=OFF
-#BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
+#BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
-
+
-# Use semicolon-separated list of toolkits if you want to disable all modules
+# Use semicolon-separated list of toolkits if you want to disable all modules
-#  and build only some toolkits.
+#  and build only some toolkits.
-#BUILD_ADDITIONAL_TOOLKITS=
+#BUILD_ADDITIONAL_TOOLKITS=
-
+
-# Set a directory recognized as a patch for OCCT.
+# Set a directory recognized as a patch for OCCT.
-#BUILD_PATCH=
+#BUILD_PATCH=
-
+
-#BUILD_MODULE_ApplicationFramework=ON
+#BUILD_MODULE_ApplicationFramework=ON
-#BUILD_MODULE_DataExchange=ON
+#BUILD_MODULE_DataExchange=ON
-#BUILD_MODULE_DETools=OFF
+#BUILD_MODULE_Draw=ON
-#BUILD_MODULE_Draw=ON
+#BUILD_MODULE_ModelingAlgorithms=ON
-#BUILD_MODULE_ModelingAlgorithms=ON
+#BUILD_MODULE_ModelingData=ON
-#BUILD_MODULE_ModelingData=ON
+#BUILD_MODULE_Visualization=ON
-#BUILD_MODULE_Visualization=ON
+
-
+#USE_FFMPEG=OFF
-#USE_FFMPEG=OFF
+#USE_FREEIMAGE=OFF
-#USE_FREEIMAGE=OFF
+#USE_GLES2=OFF
-#USE_GLES2=OFF
+#USE_RAPIDJSON=OFF
-#USE_RAPIDJSON=OFF
+#USE_DRACO=OFF
-#USE_DRACO=OFF
+#USE_TBB=OFF
-#USE_TBB=OFF
+#USE_VTK=OFF
-#USE_VTK=OFF
+
-
+# This is to add any additional arguments to cmake
-# This is to add any additional arguments to cmake
+#AUX_ARGS=
-#AUX_ARGS=

adm/scripts/cmake_gen.bat

@@ -28,7 +28,6 @@ set BUILD_FORCE_RelWithDebInfo=OFF
 
 set BUILD_MODULE_ApplicationFramework=ON
 set BUILD_MODULE_DataExchange=ON
-set BUILD_MODULE_DETools=OFF
 set BUILD_MODULE_Draw=ON
 set BUILD_MODULE_ModelingAlgorithms=ON
 set BUILD_MODULE_ModelingData=ON
@@ -63,7 +62,6 @@ cmake -G "%arch_compile%" ^
   -D BUILD_LIBRARY_TYPE:STRING=%BUILD_LIBRARY_TYPE% ^
   -D BUILD_MODULE_ApplicationFramework:BOOL=%BUILD_MODULE_ApplicationFramework% ^
   -D BUILD_MODULE_DataExchange:BOOL=%BUILD_MODULE_DataExchange% ^
-  -D BUILD_MODULE_DETools:BOOL=%BUILD_MODULE_DETools% ^
   -D BUILD_MODULE_Draw:BOOL=%BUILD_MODULE_Draw% ^
   -D BUILD_MODULE_FoundationClasses:BOOL=ON ^
   -D BUILD_MODULE_ModelingAlgorithms:BOOL=%BUILD_MODULE_ModelingAlgorithms% ^

adm/scripts/cmake_gen.sh

@@ -31,7 +31,6 @@ BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
 
 BUILD_MODULE_ApplicationFramework=ON
 BUILD_MODULE_DataExchange=ON
-BUILD_MODULE_DETools=OFF
 BUILD_MODULE_Draw=ON
 BUILD_MODULE_ModelingAlgorithms=ON
 BUILD_MODULE_ModelingData=ON
@@ -64,7 +63,6 @@ cmake -G "Unix Makefiles" \
   -D BUILD_LIBRARY_TYPE:STRING=$BUILD_LIBRARY_TYPE \
   -D BUILD_MODULE_ApplicationFramework:BOOL=$BUILD_MODULE_ApplicationFramework \
   -D BUILD_MODULE_DataExchange:BOOL=$BUILD_MODULE_DataExchange \
-  -D BUILD_MODULE_DETools:BOOL=$BUILD_MODULE_DETools \
   -D BUILD_MODULE_Draw:BOOL=$BUILD_MODULE_Draw \
   -D BUILD_MODULE_FoundationClasses:BOOL=ON \
   -D BUILD_MODULE_ModelingAlgorithms:BOOL=$BUILD_MODULE_ModelingAlgorithms \

adm/scripts/ios_build.sh

@@ -34,7 +34,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF
 
 export USE_FREETYPE=ON
 export USE_FREEIMAGE=OFF
@@ -149,7 +148,6 @@ function buildArch {
   -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
   -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
   -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
-  -D BUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
   -D BUILD_MODULE_Draw:BOOL="OFF" \
   -D BUILD_DOC_Overview:BOOL="OFF" \
     "$aCasSrc" 2>&1 | tee -a "$aLogFile"

adm/scripts/ios_custom.sh.template

@@ -1,31 +1,30 @@
-# environment configuration template for ios_build.sh (to be renamed as ios_custom_env.sh)
+# environment configuration template for ios_build.sh (to be renamed as ios_custom_env.sh)
-export PATH=/Applications/CMake.app/Contents/bin:$PATH
+export PATH=/Applications/CMake.app/Contents/bin:$PATH
-export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-ios"
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-ios"
-export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-ios"
+export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-ios"
-export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
+export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
-export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-ios"
+export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-ios"
-
+
-# Uncomment to customize building steps
+# Uncomment to customize building steps
-#export isStatic=0
+#export isStatic=0
-#export toCMake=1
+#export toCMake=1
-#export toClean=1
+#export toClean=1
-#export toMake=1
+#export toMake=1
-#export toInstall=1
+#export toInstall=1
-#export toPack=0
+#export toPack=0
-#export toPackFat=1
+#export toPackFat=1
-#export toDebug=0
+#export toDebug=0
-
+
-#export BUILD_ModelingData=ON
+#export BUILD_ModelingData=ON
-#export BUILD_ModelingAlgorithms=ON
+#export BUILD_ModelingAlgorithms=ON
-#export BUILD_Visualization=ON
+#export BUILD_Visualization=ON
-#export BUILD_ApplicationFramework=ON
+#export BUILD_ApplicationFramework=ON
-#export BUILD_DataExchange=ON
+#export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF
+
-
+#export USE_RAPIDJSON=ON
-#export USE_RAPIDJSON=ON
+#export USE_DRACO=ON
-#export USE_DRACO=ON
+#export USE_FREEIMAGE=ON
-#export USE_FREEIMAGE=ON
+
-
+#export IPHONEOS_DEPLOYMENT_TARGET=8.0
-#export IPHONEOS_DEPLOYMENT_TARGET=8.0
+#export anAbiList="iPhoneOS|arm64 iPhoneSimulator|arm64 iPhoneSimulator|x86_64"
-#export anAbiList="iPhoneOS|arm64 iPhoneSimulator|arm64 iPhoneSimulator|x86_64"
+#export anAbiList="iPhoneOS|arm64"
-#export anAbiList="iPhoneOS|arm64"

adm/scripts/macos_build.sh

@@ -34,7 +34,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF
 export BUILD_Draw=ON
 
 export USE_FREETYPE=ON
@@ -146,7 +145,6 @@ function buildArch {
   -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
   -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
   -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
-  -D BUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
   -D BUILD_MODULE_Draw:BOOL="${BUILD_Draw}" \
   -D BUILD_DOC_Overview:BOOL="OFF" \
     "$aCasSrc" 2>&1 | tee -a "$aLogFile"

adm/scripts/macos_custom.sh.template

@@ -1,32 +1,31 @@
-# environment configuration template for macos_build.sh (to be renamed as macos_custom_env.sh)
+# environment configuration template for macos_build.sh (to be renamed as macos_custom_env.sh)
-export PATH=/Applications/CMake.app/Contents/bin:$PATH
+export PATH=/Applications/CMake.app/Contents/bin:$PATH
-export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-macos"
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-macos"
-export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-macos"
+export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-macos"
-export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
+export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
-export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-macos"
+export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-macos"
-
+
-# Uncomment to customize building steps
+# Uncomment to customize building steps
-#export aBuildRoot=work
+#export aBuildRoot=work
-#export toCMake=1
+#export toCMake=1
-#export toClean=1
+#export toClean=1
-#export toMake=1
+#export toMake=1
-#export toInstall=1
+#export toInstall=1
-#export toPack=1
+#export toPack=1
-#export toPackFat=1
+#export toPackFat=1
-
+
-#export BUILD_ModelingData=ON
+#export BUILD_ModelingData=ON
-#export BUILD_ModelingAlgorithms=ON
+#export BUILD_ModelingAlgorithms=ON
-#export BUILD_Visualization=ON
+#export BUILD_Visualization=ON
-#export BUILD_ApplicationFramework=ON
+#export BUILD_ApplicationFramework=ON
-#export BUILD_DataExchange=ON
+#export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF
+#export BUILD_Draw=ON
-#export BUILD_Draw=ON
+
-
+#export USE_RAPIDJSON=ON
-#export USE_RAPIDJSON=ON
+#export USE_DRACO=ON
-#export USE_DRACO=ON
+#export USE_FREEIMAGE=ON
-#export USE_FREEIMAGE=ON
+
-
+#export MACOSX_DEPLOYMENT_TARGET=10.10
-#export MACOSX_DEPLOYMENT_TARGET=10.10
+#export anAbiList=arm64
-#export anAbiList=arm64
+#export anAbiList=x86_64
-#export anAbiList=x86_64
+#export anAbiList="arm64 x86_64"
-#export anAbiList="arm64 x86_64"

adm/scripts/mingw_build.bat

@@ -32,7 +32,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"
 set "BUILD_Draw=ON"
 
 rem Optional 3rd-party libraries to enable
@@ -156,7 +155,6 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="%BUILD_DETools%" ^
  -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
  -D 3RDPARTY_TCL_DIR:PATH="%aTclTk%" ^
  -D 3RDPARTY_TCL_INCLUDE_DIR:FILEPATH="%aTclTk%/include" ^

adm/scripts/mingw_custom.bat.template

@@ -1,30 +1,29 @@
-rem Environment configuration template for mingw_build.bat (to be renamed as mingw_custom.bat)
+rem Environment configuration template for mingw_build.bat (to be renamed as mingw_custom.bat)
-set "aCmakeBin=%ProgramW6432%\CMake\bin"
+set "aCmakeBin=%ProgramW6432%\CMake\bin"
-set "aFreeType=%aCasSrc%/../3rdparty/freetype-2.6.3-mingw-64"
+set "aFreeType=%aCasSrc%/../3rdparty/freetype-2.6.3-mingw-64"
-set "aTclTk=%aCasSrc%/../3rdparty/tcltk-8.6.4-mingw-64"
+set "aTclTk=%aCasSrc%/../3rdparty/tcltk-8.6.4-mingw-64"
-set "aFreeImage=%aCasSrc%/../3rdparty/freeimage-3.17-0-mingw-64"
+set "aFreeImage=%aCasSrc%/../3rdparty/freeimage-3.17-0-mingw-64"
-set "aRapidJson=%aCasSrc%/../3rdparty/rapidjson-1.1.0"
+set "aRapidJson=%aCasSrc%/../3rdparty/rapidjson-1.1.0"
-set "aDraco=%aCasSrc%/../3rdparty/draco-1.4-1-mingw-64"
+set "aDraco=%aCasSrc%/../3rdparty/draco-1.4-1-mingw-64"
-
+
-set "aMingwVars=c:\mingw-8.3.0-msys2\mingwvars.bat"
+set "aMingwVars=c:\mingw-8.3.0-msys2\mingwvars.bat"
-
+
-rem Uncomment to customize building steps
+rem Uncomment to customize building steps
-rem set "aBuildRoot=work"
+rem set "aBuildRoot=work"
-rem set "toCMake=1"
+rem set "toCMake=1"
-rem set "toClean=1"
+rem set "toClean=1"
-rem set "toMake=1"
+rem set "toMake=1"
-rem set "toInstall=1"
+rem set "toInstall=1"
-rem set "toPack=1"
+rem set "toPack=1"
-rem set "toDebug=0"
+rem set "toDebug=0"
-
+
-rem set "BUILD_ModelingData=ON"
+rem set "BUILD_ModelingData=ON"
-rem set "BUILD_ModelingAlgorithms=ON"
+rem set "BUILD_ModelingAlgorithms=ON"
-rem set "BUILD_Visualization=ON"
+rem set "BUILD_Visualization=ON"
-rem set "BUILD_ApplicationFramework=ON"
+rem set "BUILD_ApplicationFramework=ON"
-rem set "BUILD_DataExchange=ON"
+rem set "BUILD_DataExchange=ON"
-rem set "BUILD_DETools=OFF"
+rem set "BUILD_Draw=ON"
-rem set "BUILD_Draw=ON"
+
-
+rem set "USE_RAPIDJSON=ON"
-rem set "USE_RAPIDJSON=ON"
+rem set "USE_DRACO=ON"
-rem set "USE_DRACO=ON"
+rem set "USE_FREEIMAGE=ON"
-rem set "USE_FREEIMAGE=ON"

adm/scripts/wasm_build.bat

@@ -32,7 +32,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"
 set "BUILD_Draw=OFF"
 
 rem Optional 3rd-party libraries to enable
@@ -176,7 +175,6 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="%BUILD_DETools%" ^
  -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
  -D BUILD_DOC_Overview:BOOL="OFF" ^
  -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^

adm/scripts/wasm_build.sh

@@ -20,7 +20,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF
 
 if [ -f "${aScriptDir}/wasm_custom.sh" ] ; then
   . "${aScriptDir}/wasm_custom.sh"
@@ -75,7 +74,6 @@ echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
--DBUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
 -DBUILD_MODULE_Draw:BOOL="OFF" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
 
@@ -94,7 +92,6 @@ cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
--DBUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
 -DBUILD_MODULE_Draw:BOOL="OFF" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
 

adm/scripts/wasm_custom.bat.template

@@ -1,30 +1,29 @@
-rem Environment configuration template for wasm_build.bat (to be renamed as wasm_custom.bat)
+rem Environment configuration template for wasm_build.bat (to be renamed as wasm_custom.bat)
-set "EMSDK_ROOT=%aCasSrc%\..\emsdk"
+set "EMSDK_ROOT=%aCasSrc%\..\emsdk"
-set "aFreeType=%aCasSrc%\..\3rdparty\freetype-2.7.1-wasm32"
+set "aFreeType=%aCasSrc%\..\3rdparty\freetype-2.7.1-wasm32"
-rem set "aRapidJson=%aCasSrc%\..\3rdparty\rapidjson-1.1.0"
+rem set "aRapidJson=%aCasSrc%\..\3rdparty\rapidjson-1.1.0"
-rem set "aDraco=%aCasSrc%\..\3rdparty\draco-1.4.1-wasm32"
+rem set "aDraco=%aCasSrc%\..\3rdparty\draco-1.4.1-wasm32"
-rem set "aCmakeBin=%ProgramW6432%\CMake\bin"
+rem set "aCmakeBin=%ProgramW6432%\CMake\bin"
-
+
-rem Uncomment to customize building steps
+rem Uncomment to customize building steps
-rem set "aBuildRoot=work"
+rem set "aBuildRoot=work"
-rem set "toCMake=1"
+rem set "toCMake=1"
-rem set "toClean=1"
+rem set "toClean=1"
-rem set "toMake=1"
+rem set "toMake=1"
-rem set "toInstall=1"
+rem set "toInstall=1"
-rem set "toPack=1"
+rem set "toPack=1"
-rem set "toDebug=1"
+rem set "toDebug=1"
-rem set "toBuildSample=1"
+rem set "toBuildSample=1"
-rem Source map base (should point to server where C++ sources will be copied)
+rem Source map base (should point to server where C++ sources will be copied)
-rem enables -g4 debug building option for WebGL sample and allows navigating C++ source code within JavaScript debugger.
+rem enables -g4 debug building option for WebGL sample and allows navigating C++ source code within JavaScript debugger.
-rem set "sourceMapBase=http://localhost:9090/"
+rem set "sourceMapBase=http://localhost:9090/"
-
+
-rem set "BUILD_ModelingData=ON"
+rem set "BUILD_ModelingData=ON"
-rem set "BUILD_ModelingAlgorithms=ON"
+rem set "BUILD_ModelingAlgorithms=ON"
-rem set "BUILD_Visualization=ON"
+rem set "BUILD_Visualization=ON"
-rem set "BUILD_ApplicationFramework=ON"
+rem set "BUILD_ApplicationFramework=ON"
-rem set "BUILD_DataExchange=ON"
+rem set "BUILD_DataExchange=ON"
-rem set "BUILD_DETools=OFF"
+
-
+rem set "USE_RAPIDJSON=ON"
-rem set "USE_RAPIDJSON=ON"
+rem set "USE_DRACO=ON"
-rem set "USE_DRACO=ON"
+rem set "USE_PTHREADS=ON"
-rem set "USE_PTHREADS=ON"

adm/scripts/wasm_custom.sh.template

@@ -1,17 +1,16 @@
-# environment configuration template for occ_build_wasm.sh (to be renamed as wasm_custom_env.sh)
+# environment configuration template for occ_build_wasm.sh (to be renamed as wasm_custom_env.sh)
-export aFreeType="$aSrcRoot/../3rdparty/freetype-2.7.1-wasm"
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.7.1-wasm"
-export EMSDK_ROOT="$aSrcRoot/../emsdk"
+export EMSDK_ROOT="$aSrcRoot/../emsdk"
-
+
-# Uncomment to customize building steps
+# Uncomment to customize building steps
-#export aBuildRoot=work
+#export aBuildRoot=work
-#export toCMake=1
+#export toCMake=1
-#export toClean=0
+#export toClean=0
-#export toMake=1
+#export toMake=1
-#export toInstall=1
+#export toInstall=1
-
+
-#export BUILD_ModelingData=ON
+#export BUILD_ModelingData=ON
-#export BUILD_ModelingAlgorithms=ON
+#export BUILD_ModelingAlgorithms=ON
-#export BUILD_Visualization=ON
+#export BUILD_Visualization=ON
-#export BUILD_ApplicationFramework=ON
+#export BUILD_ApplicationFramework=ON
-#export BUILD_DataExchange=ON
+#export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF

adm/svgdiff.bat

@@ -0,0 +1,31 @@
+@echo off
+rem Script to diff SVG images visually (as PNG) in TortoiseGit client
+rem 
+rem It assumes that Inkscape and TortoiseGitIDiff executables are either 
+rem installed in default locations in Program Files, or are accessible by PATH
+rem 
+rem To use this script for diffing SVG images, open TortoiseGit settings
+rem (Start -> Programs -> TortoiseGit -> Settings), select "Diff Viewer",
+rem click button "Advanced..." on the right tab and then add new record:
+rem - Extension: .svg
+rem - External program: <path to OCCT>\adm\svgdiff.bat %base %mine %bname %yname
+
+rem Remove double quotes around arguments
+set "f1=%1"
+set "f2=%2"
+set "f1=%f1:~1,-1%.png"
+set "f2=%f2:~1,-1%.png"
+
+rem Check if Inkscape and TortoiseGit are installed in default locations in 
+rem ProgramFiles; if not, assume they still may be accessible by PATH
+set "inkscape=%ProgramFiles%\Inkscape\inkscape.exe"
+if not exist "%inkscape%" set inkscape=inkscape.exe
+set "tgitidiff=%ProgramFiles%\TortoiseGit\bin\TortoiseGitIDiff.exe"
+if not exist "%tgitidiff%" set tgitidiff=TortoiseGitIDiff.exe
+
+rem Convert SVG to PNG using Inkscape
+"%inkscape%" -e "%f1%" %1
+"%inkscape%" -e "%f2%" %2
+
+rem Call Tortoise differ
+"%tgitidiff%" /left:"%f1%" /right:"%f2%" /lefttitle:%3 /righttitle:%4

adm/templates/OpenCASCADECompileDefinitionsAndFlags.cmake.in

@@ -1,14 +1,14 @@
-#-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
-#
+#
-# OpenCASCADECompileDefinitionsAndFlags-@OCCT_CONFIGURATION_LOWER@.cmake - OpenCASCADE CMake file 
+# OpenCASCADECompileDefinitionsAndFlags-@OCCT_CONFIGURATION_LOWER@.cmake - OpenCASCADE CMake file 
-# with compile definitions and C/C++ flags for @OCCT_CONFIGURATION@ configuration.
+# with compile definitions and C/C++ flags for @OCCT_CONFIGURATION@ configuration.
-#
+#
-# This file is configured by OpenCASCADE.
+# This file is configured by OpenCASCADE.
-#
+#
-
+
-# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
+# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
-set (OpenCASCADE_C_FLAGS_@OCCT_CONFIGURATION_UPPER@      "@SET_OpenCASCADE_CMAKE_C_FLAGS@")
+set (OpenCASCADE_C_FLAGS_@OCCT_CONFIGURATION_UPPER@      "@SET_OpenCASCADE_CMAKE_C_FLAGS@")
-set (OpenCASCADE_CXX_FLAGS_@OCCT_CONFIGURATION_UPPER@    "@SET_OpenCASCADE_CMAKE_CXX_FLAGS@")
+set (OpenCASCADE_CXX_FLAGS_@OCCT_CONFIGURATION_UPPER@    "@SET_OpenCASCADE_CMAKE_CXX_FLAGS@")
-
+
-# The compile definitions used by OpenCASCADE.
+# The compile definitions used by OpenCASCADE.
-@SET_OpenCASCADE_COMPILE_DEFINITIONS@
+@SET_OpenCASCADE_COMPILE_DEFINITIONS@

adm/templates/OpenCASCADEConfig.cmake.in

@@ -1,94 +1,94 @@
-#-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
-#
+#
-# OpenCASCADEConfig.cmake - OpenCASCADE CMake configuration file for external projects.
+# OpenCASCADEConfig.cmake - OpenCASCADE CMake configuration file for external projects.
-#
+#
-# This file is configured by OpenCASCADE.
+# This file is configured by OpenCASCADE.
-#
+#
-
+
-if(OpenCASCADE_ALREADY_INCLUDED)
+if(OpenCASCADE_ALREADY_INCLUDED)
-  return()
+  return()
-endif()
+endif()
-set(OpenCASCADE_ALREADY_INCLUDED 1)
+set(OpenCASCADE_ALREADY_INCLUDED 1)
-
+
-# The OpenCASCADE version number
+# The OpenCASCADE version number
-set (OpenCASCADE_MAJOR_VERSION       "@OCC_VERSION_MAJOR@")
+set (OpenCASCADE_MAJOR_VERSION       "@OCC_VERSION_MAJOR@")
-set (OpenCASCADE_MINOR_VERSION       "@OCC_VERSION_MINOR@")
+set (OpenCASCADE_MINOR_VERSION       "@OCC_VERSION_MINOR@")
-set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@")
+set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@")
-set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
+set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
-
+
-# Compute the installation prefix from this OpenCASCADEConfig.cmake file 
+# Compute the installation prefix from this OpenCASCADEConfig.cmake file 
-# location, by going up one level + one level if "cmake" + one level if "lib".
+# location, by going up one level + one level if "cmake" + one level if "lib".
-# This is made to support different locations of CMake files:
+# This is made to support different locations of CMake files:
-# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version>
+# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version>
-# - in Windows style: $INSTALL_DIR/cmake
+# - in Windows style: $INSTALL_DIR/cmake
-# - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade-<version>
+# - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade-<version>
-get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-endif()
+endif()
-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-endif()
+endif()
-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-endif()
+endif()
-
+
-# Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
+# Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
-set (OpenCASCADE_BINARY_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
+set (OpenCASCADE_BINARY_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
-set (OpenCASCADE_LIBRARY_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_LIB@")
+set (OpenCASCADE_LIBRARY_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_LIB@")
-set (OpenCASCADE_SCRIPT_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_SCRIPT@")
+set (OpenCASCADE_SCRIPT_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_SCRIPT@")
-set (OpenCASCADE_INCLUDE_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_INCLUDE@")
+set (OpenCASCADE_INCLUDE_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_INCLUDE@")
-set (OpenCASCADE_RESOURCE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_RESOURCE@")
+set (OpenCASCADE_RESOURCE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_RESOURCE@")
-
+
-# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
+# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
-set (OpenCASCADE_C_FLAGS      "@CMAKE_C_FLAGS@")
+set (OpenCASCADE_C_FLAGS      "@CMAKE_C_FLAGS@")
-set (OpenCASCADE_CXX_FLAGS    "@CMAKE_CXX_FLAGS@")
+set (OpenCASCADE_CXX_FLAGS    "@CMAKE_CXX_FLAGS@")
-@SET_OpenCASCADE_LINKER_FLAGS@
+@SET_OpenCASCADE_LINKER_FLAGS@
-
+
-# List of available OpenCASCADE modules.
+# List of available OpenCASCADE modules.
-set (OpenCASCADE_MODULES @OCCT_MODULES_ENABLED@)
+set (OpenCASCADE_MODULES @OCCT_MODULES_ENABLED@)
-@SET_OpenCASCADE_MODULES_TOOLKITS@
+@SET_OpenCASCADE_MODULES_TOOLKITS@
-# List of available OpenCASCADE libraries.
+# List of available OpenCASCADE libraries.
-set (OpenCASCADE_LIBRARIES @OCCT_LIBRARIES@)
+set (OpenCASCADE_LIBRARIES @OCCT_LIBRARIES@)
-
+
-# OpenCASCADE global configuration options.
+# OpenCASCADE global configuration options.
-set (OpenCASCADE_COMPILER          "@COMPILER@")
+set (OpenCASCADE_COMPILER          "@COMPILER@")
-set (OpenCASCADE_BUILD_WITH_DEBUG  @BUILD_WITH_DEBUG@)
+set (OpenCASCADE_BUILD_WITH_DEBUG  @BUILD_WITH_DEBUG@)
-set (OpenCASCADE_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+set (OpenCASCADE_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
-@SET_OpenCASCADE_BUILD_TYPE@
+@SET_OpenCASCADE_BUILD_TYPE@
-
+
-# Use of third-party libraries.
+# Use of third-party libraries.
-set (OpenCASCADE_WITH_TCL       @USE_TCL@)
+set (OpenCASCADE_WITH_TCL       @USE_TCL@)
-set (OpenCASCADE_WITH_FREETYPE  @USE_FREETYPE@)
+set (OpenCASCADE_WITH_FREETYPE  @USE_FREETYPE@)
-set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
+set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
-set (OpenCASCADE_WITH_TBB       @USE_TBB@)
+set (OpenCASCADE_WITH_TBB       @USE_TBB@)
-set (OpenCASCADE_WITH_VTK       @USE_VTK@)
+set (OpenCASCADE_WITH_VTK       @USE_VTK@)
-set (OpenCASCADE_WITH_FFMPEG    @USE_FFMPEG@)
+set (OpenCASCADE_WITH_FFMPEG    @USE_FFMPEG@)
-set (OpenCASCADE_WITH_GLES2     @USE_GLES2@)
+set (OpenCASCADE_WITH_GLES2     @USE_GLES2@)
-@SET_OpenCASCADE_WITH_D3D@
+@SET_OpenCASCADE_WITH_D3D@
-@SET_OpenCASCADE_WITH_GLX@
+@SET_OpenCASCADE_WITH_GLX@
-
+
-# Import OpenCASCADE compile definitions, C and C++ flags for each installed configuration.
+# Import OpenCASCADE compile definitions, C and C++ flags for each installed configuration.
-file(GLOB CONFIG_FILES "${CMAKE_CURRENT_LIST_DIR}/OpenCASCADECompileDefinitionsAndFlags-*.cmake")
+file(GLOB CONFIG_FILES "${CMAKE_CURRENT_LIST_DIR}/OpenCASCADECompileDefinitionsAndFlags-*.cmake")
-foreach(f ${CONFIG_FILES})
+foreach(f ${CONFIG_FILES})
-  include(${f})
+  include(${f})
-endforeach()
+endforeach()
-
+
-if (NOT OpenCASCADE_FIND_COMPONENTS)
+if (NOT OpenCASCADE_FIND_COMPONENTS)
-  set (OpenCASCADE_FIND_COMPONENTS ${OpenCASCADE_MODULES})
+  set (OpenCASCADE_FIND_COMPONENTS ${OpenCASCADE_MODULES})
-endif ()
+endif ()
-
+
-# Import OpenCASCADE targets.
+# Import OpenCASCADE targets.
-foreach(_comp ${OpenCASCADE_FIND_COMPONENTS})
+foreach(_comp ${OpenCASCADE_FIND_COMPONENTS})
-  if (NOT ";${OpenCASCADE_MODULES};" MATCHES "${_comp}")
+  if (NOT ";${OpenCASCADE_MODULES};" MATCHES "${_comp}")
-    set(OpenCASCADE_FOUND False)
+    set(OpenCASCADE_FOUND False)
-    set(OpenCASCADE_NOTFOUND_MESSAGE "Specified unsupported component: ${_comp}")
+    set(OpenCASCADE_NOTFOUND_MESSAGE "Specified unsupported component: ${_comp}")
-    if (NOT OpenCASCADE_FIND_QUIETLY)
+    if (NOT OpenCASCADE_FIND_QUIETLY)
-      message (ERROR ": ${OpenCASCADE_NOTFOUND_MESSAGE}")
+      message (ERROR ": ${OpenCASCADE_NOTFOUND_MESSAGE}")
-    endif()
+    endif()
-  else()
+  else()
-    include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake")
-  endif()
+  endif()
-endforeach()
+endforeach()

adm/templates/android.toolchain.config.cmake

@@ -1,8 +1,8 @@
-# A toolchain file to configure a Makefile Generators or the Ninja generator to target Android for cross-compiling.
+# A toolchain file to configure a Makefile Generators or the Ninja generator to target Android for cross-compiling.
-# Set CMAKE_ANDROID_NDK variable equal to your Android NDK path.
+# Set CMAKE_ANDROID_NDK variable equal to your Android NDK path.
-
+
-set (CMAKE_SYSTEM_NAME       Android)
+set (CMAKE_SYSTEM_NAME       Android)
-set (CMAKE_SYSTEM_VERSION    15) # API level
+set (CMAKE_SYSTEM_VERSION    15) # API level
-set (CMAKE_ANDROID_ARCH_ABI  armeabi-v7a)
+set (CMAKE_ANDROID_ARCH_ABI  armeabi-v7a)
-set (CMAKE_ANDROID_NDK       "")
+set (CMAKE_ANDROID_NDK       "")
-set (CMAKE_ANDROID_STL_TYPE  gnustl_shared)
+set (CMAKE_ANDROID_STL_TYPE  gnustl_shared)