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

Jump to bottom

CMake minor improvements #3783

Merged
merged 9 commits into from Nov 27, 2017
Merged

CMake minor improvements #3783

merged 9 commits into from Nov 27, 2017

Conversation

scribam
Copy link
Contributor

@scribam scribam commented Nov 25, 2017

  • Simplify ALSA, GLEW, Qt, ZLIB detection/integration in CMake
  • Replace some C checks to C++ ones
  • Use a consistent coding style across the file rpcs3/CMakeLists.txt

hcorion
hcorion approved these changes Nov 25, 2017
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.

👍 thanks, the cmake files really needed this.

@Nekotekina Nekotekina merged commit 5f07f78 into RPCS3:master Nov 27, 2017
@scribam scribam deleted the cmake-improvements branch November 27, 2017 18:33
isJuhn pushed a commit to isJuhn/rpcs3 that referenced this pull request Jan 19, 2018
@scribam @isJuhn
CMake minor improvements (RPCS3#3783)
c197959 
* cmake: simplify GLEW integration

* cmake: simplify ZLIB integration

* cmake: simplify ALSA detection

* cmake: check C++ compiler and flags instead of C ones

* cmake: bring consistency in Qt packages detection and remove unnecessary related "include_directories"

* cmake: harmonize coding style

* cmake: set CMAKE_INCLUDE_CURRENT_DIR to ON only when necessary
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hcorion hcorion hcorion approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@scribam @hcorion @Nekotekina