Update to diagnostics/qt to reflect new cmake behavior. #788
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
Codecov Report
@@ Coverage Diff @@
## develop #788 +/- ##
=======================================
Coverage 94.0% 94.0%
=======================================
Files 367 367
Lines 17229 17229
=======================================
Hits 16197 16197
Misses 1032 1032 |
|
clang is generating warnings CMake Warning at config/vendor_libraries.cmake:319 (find_package):
By not providing "FindQt5.cmake" in CMAKE_MODULE_PATH this project has
asked CMake to find a package configuration file provided by "Qt5", but
CMake did not find one.
Could not find a package configuration file provided by "Qt5" with any of
the following names:
Qt5Config.cmake
qt5-config.cmake
Add the installation prefix of "Qt5" to CMAKE_PREFIX_PATH or set "Qt5_DIR"
to a directory containing one of the above files. If "Qt5" provides a
separate development package or SDK, be sure it has been installed.
Call Stack (most recent call first):
config/vendor_libraries.cmake:635 (setupQt)
config/vendor_libraries.cmake:797 (setupVendorLibrariesUnix)
CMakeLists.txt:95 (setupVendorLibraries)I'm looking into it. |
|
@keadyk It looks like there is a remaining configure warning for clang and valgrind builds. I'll deal with that as a separate issue. I'm rerunning the snow tests right now. Trinitite is on DST. |
|
Snow builds look okay. There are warnings related to IPO for release builds. I'm working with Doug to fix that (we might just IPO off). Again, let's deal with that later. We need to get the regressions running again. |
keadyk
approved these changes
Apr 2, 2020
+ After upgrading to cmake-3.17.0, our one Qt example failed to configure or
build. I have updated build system logic to match what cmake-3.17+ expects for
Qt applications.
+ Greatly simplify Qt discovery in `vendor_libraries.cmake`, but require Qt5
(disallow Qt3 or Qt4).
+ When building `diagnostics/qt` require cmake-3.17.0+:
+ Begin using `CMAKE_AUTOUIC` and `CMAKE_AUTORCC`.
+ CMake no longer requries the use of the macros `qt5_wrap_ui` or
`add_resources`.
+ `.ui` files are now treated like source files.
+ Add code to delete move ctors and move assignment operators.
+ Update default dev env to load cmake/3.17.0 on CTS-1 and ATS-1.
KineticTheory
force-pushed
the
fix_for_cmake3170_plus_qt
branch
from
1bf827e
to
8df05e3
Compare
|
I will plan to merge when the latest github checks pass, unless you object @KineticTheory |
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.
Background
Purpose of Pull Request
Description of changes
vendor_libraries.cmake, but require Qt5 (disallow Qt3 or Qt4).diagnostics/qtrequire cmake-3.17.0+:CMAKE_AUTOUICandCMAKE_AUTORCC.qt5_wrap_uioradd_resources..uifiles are now treated like source files.Status