[Cpp][Qt][Client] Fix CMakeLists.txt, Qt::Gui, Find_Package(OpenSSL)#11967
Merged
wing328 merged 2 commits intoOpenAPITools:masterfrom May 15, 2022
Conversation
Changed: Always add Qt5::Gui to build Added: find_package for OpenSSL (if not Apple)
5 tasks
Contributor
|
I'd like to add the same kind check for qmake but I wondered how to disable oauth? When generating the example (which you should do to make this PR happy), the Qt5::Gui is indeed present. |
MartinDelille
suggested changes
Mar 25, 2022
Contributor
MartinDelille
left a comment
There was a problem hiding this comment.
Generate the sample code.
MartinDelille
approved these changes
Mar 30, 2022
Contributor
Author
|
@wing328, @muttleyxd , @MartinDelille Is there anything left to do for me ? |
Member
|
Tested locally and the result is good: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note replacement of : #11950
Description
Changed: Always add Qt5::Gui to build, needed because {{prefix}}Oauth.h is always part of the build
Added: find_package for OpenSSL, should be done prior target_link_libraries
Tests that have been done :
(ubuntu)
install deps (reference #11371 ):
sudo apt install -y --no-install-recommends qt5-default
run code generator:
java -jar openapi-generator-cli-5.4.0.jar generate -t cpp-qt-templates -i petstore.json -g cpp-qt-client -o petstore
run cmake:
cmake -S petstore -B petstore/build
(windows)
run code generator:
java -jar openapi-generator-cli-5.4.0.jar generate -t cpp-qt-templates -i petstore.json -g cpp-qt-client -o petstore
run cmake:
cmake -S petstore -B petstore/build
Issue
fixes #11371
technical commitee
@wing328
cc @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @MartinDelille (2018/03) @muttleyxd (2019/08)
PR checklist
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*.For Windows users, please run the script in Git BASH.
master(5.3.0),6.0.x