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

BUILD: cmake corrections #10782

Merged
merged 2 commits into from Sep 16, 2021
Merged

BUILD: cmake corrections #10782

merged 2 commits into from Sep 16, 2021

Conversation

p01arst0rm
Copy link
Contributor

collection of changes to cmake for fixing MSVC building.

@p01arst0rm
Copy link
Contributor Author

cc @hcorion

@MSuih MSuih added the Build and CI Anything related to the build process and continuous integration label Aug 28, 2021
@p01arst0rm p01arst0rm force-pushed the cmake-fixes branch 4 times, most recently from c4a4374 to 28c350d Compare August 29, 2021 08:04
@AniLeo AniLeo requested a review from hcorion September 11, 2021 01:30
hcorion
hcorion approved these changes Sep 11, 2021
View reviewed changes
Copy link
Member

@hcorion hcorion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the late review, looks good

@p01arst0rm
Copy link
Contributor Author

test fail seems to have nothing to do with the PR; seems ok.

@AniLeo
Copy link
Member

AniLeo commented Sep 11, 2021

Please rebase

@p01arst0rm p01arst0rm force-pushed the cmake-fixes branch 2 times, most recently from c40d99e to b14394d Compare September 15, 2021 09:32
@p01arst0rm
Copy link
Contributor Author

Please rebase

should be good now :)

@p01arst0rm
Copy link
Contributor Author

the conflicts are because the issues fixed in this PR were fixed in other PRs before this one was merged..

@p01arst0rm
Copy link
Contributor Author

theres still other improvements though. :)

@AniLeo AniLeo merged commit c6c4aa4 into RPCS3:master Sep 16, 2021
@p01arst0rm p01arst0rm deleted the cmake-fixes branch September 16, 2021 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MSuih MSuih MSuih left review comments

@Megamouse Megamouse Megamouse left review comments

@hcorion hcorion hcorion approved these changes

Assignees
No one assigned
Labels
Build and CI Anything related to the build process and continuous integration
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@p01arst0rm @AniLeo @hcorion @MSuih @Megamouse