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.

Sign up for GitHub

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

Jump to bottom

Fix qmake version generator #474

Merged
merged 1 commit into from
Sep 20, 2024
Merged

Fix qmake version generator #474

merged 1 commit into from
Sep 20, 2024

Conversation

aol-nnov
Copy link
Contributor

cmake's execute_process() has WORKING_DIRECTORY parameter, but qmake's $$system() does not.

As a workaround for qmake, git command was called with --git-dir provided explicitly. But for dirtyness detection we need --work-tree, too.

Follow-up for #471 (comment)

/cc @fralx

@aol-nnov
Fix qmake version generator
601fc38 
cmake's `execute_process()` has `WORKING_DIRECTORY` parameter, but qmake's `$$system()` does not.

As a workaround for qmake, `git` command was called with `--git-dir` provided explicitly.
But for dirtyness detection we need `--work-tree`, too.

Follow-up for fralx#471 (comment)
@aol-nnov
Copy link
Contributor Author 

mingw32-make[2]: Entering directory 'C:/projects/limereport/limereport'
sed 's/@GIT_VERSION@/1.7.14-10-gd8f2f01/' version.h.in > version.h
'C:\Qt\5.12\mingw73_64\bin\uic.exe' databrowser/lrsqleditdialog.ui -o win64/release/ui/ui_lrsqleditdialog.h

всё в порядке.

@fralx fralx merged commit 731c054 into fralx:master Sep 20, 2024
30 checks passed
@aol-nnov aol-nnov deleted the version-generator-followup branch September 20, 2024 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aol-nnov @fralx