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

Cmake improvements #4578

Merged
merged 5 commits into from
May 17, 2018
Merged

Cmake improvements #4578

merged 5 commits into from
May 17, 2018

Conversation

scribam
Copy link
Contributor

@scribam scribam commented May 14, 2018

Some improvements/cleanup for the CMake build system + cotire 1.8.0

Changelog for cotire 1.8.0

  • support for clang-cl.exe under Windows.
  • faster prefix header generation for Clang.
  • enable parallel compilation of unity target for MSVC.
  • CMake 3.9 and 3.10 compatibility fixes.
  • disable inclusion of timestamp in precompiled headers for Clang.
  • work around ccache reporting incorrect configuration.
  • honor MANUALLY_ADDED_DEPENDENCIES property upon generation of unity targets.
  • use default setting of 2 for COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES.
  • drop broken support for unity building of targets with automatic CMake Qt processing turned on.
  • manual updates.

@@ -124,7 +128,7 @@ if(NOT MSVC)

add_compile_options(-msse -msse2 -mcx16 -mrtm)

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a case of double expansion, drop the ${} around the variable name.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, thank you for the review

@@ -107,7 +107,11 @@ if(USE_NATIVE_INSTRUCTIONS)
endif()

if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-pch -Wno-unused-command-line-argument -fexceptions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-pch -fexceptions")
if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a case of double expansion, drop the ${} around the variable name.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@Nekotekina Nekotekina merged commit 8f975e2 into RPCS3:master May 17, 2018
@scribam scribam deleted the cmake-improvements branch May 17, 2018 14:45
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

4 participants