cmake improvements (integrate into synchronize.py) #4347
Merged
Conversation
This file contains 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
In addition update qt configuration to new format: - WebKit no longer available (only WebEngine) - Use new CONFIG instead of COMPONENT style discovery - People with old qt5 can still use the Makefile instead of cmake
It effects an engine *.cpp file that provides the hash to its users and should therefore reside in the corresponding CMakeLists.txt. This helps us in maintining a clean root CMakeLists.txt.
Also prevent now obsolete code in synchronize.py that oberverwites .pri files with its own contents. This is not neccessary as these are the files we edit by hand.
Before this patch the whole cmake file was overwritten on synchronize.py. Now we generate a source file list for inclusion just like for the other build systems and avoid globbing for cmake.
|
Looks good. I haven't tested it, but that can be done after the merge ;) |
|
Glad to hear. We are waiting for nav to look into it? I am just asking because I have follow up patches in the pipeline :) |
|
add_compile_options(-fcolor-diagnostics) does not work for me. (Ubuntu 18.04 on Windows, using G++8.1.0): c++: error: unrecognized command line option ‘-fcolor-diagnostics’ |
Ooops. Thought it was the same command line option for clang and gcc. Postet a fix. |
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.
Like discussed in #4341 I made some improvements to the cmake build system and integrated it into the
synchronize.pyarchitecture. This pull request only touches cmake files and the python thing.This is the preparation pull request for the one that adds an option to cmake to disable threading.
The normal build file still builds. This is no wonder as I did not touched any files of them. However, the qmake build does not build for me:
make: *** No rule to make target profiles/Tier22, needed by SimulationCraft.app/Contents/Resources/profiles/Tier22. Stop.But this is also the case for
bfa-devand was not broken by my changes.