Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.17] Doc: cmake now joins parts of offline doc-Fixes #1369

Closed
wants to merge 1 commit into from

Conversation

sgrogan
Copy link
Contributor

@sgrogan sgrogan commented Mar 20, 2018

Thank you for creating a pull request to contribute to FreeCAD! To ease integration, please confirm the following:

  • [x ] Branch re-based on latest master git pull --rebase upstream master
  • [x ] Unit tests confirmed to pass by running ./bin/FreeCAD --run-test 0
  • [? ] Commit message is well-written
  • [N/A ] Commit message includes issue #<id> or fixes #<id> where <id> is the associated MantisBT issue id if one exists

And please remember to update the Wiki with the features added or changed once this PR is merged.


Fixes Failed build on Travis: https://travis-ci.org/FreeCAD/FreeCAD/builds/355423073?utm_source=github_status&utm_medium=notification

Create destination directory for concatenated file prior to writing file.
Concatenates the offline doc and writes to Build/doc directory so it's available with an non-installed build.
Only concatenates the file if BUILD_GUI=TRUE

@sgrogan sgrogan changed the title Cat doc [0.17] Doc: cmake now joins parts of offline doc-Fixes Mar 20, 2018
@wwmayer
Copy link
Contributor

wwmayer commented Mar 21, 2018

Merged.

@wwmayer wwmayer closed this Mar 21, 2018
@sgrogan sgrogan deleted the cat-doc branch March 24, 2018 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants