diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-03-27 01:08:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 01:08:37 +0100 |
| commit | 0716ff28d4e9456ce86b9f1b4b156068ce1545e6 (patch) | |
| tree | 6e76a5f4214bec24004ce054ef702f1122782559 | |
| parent | 25f342e606c78e3da390ace708aebb50485ab9bf (diff) | |
| parent | 0422d67b9d5f1f3ca68ae389d4f1136b352f9aab (diff) | |
Merge pull request #3750 from Holzhaus/cmake-3.20-qrc-fix
CMake: Fix Qt resource files with CMake 3.20
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index be67c340d0..d365f39f05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1612,15 +1612,14 @@ add_dependencies(mixxx-test mixxx-testdata) # # Resources # -add_library(mixxx-qrc OBJECT EXCLUDE_FROM_ALL res/mixxx.qrc) -set_target_properties(mixxx-qrc PROPERTIES AUTORCC ON) - # Add resources to mixxx and mixxx-test binaries, not the mixxx-lib static # library. Doing this would require initialization using Q_INIT_RESOURCE() # calls that are not present at the moment. Further information can be found # at: https://doc.qt.io/qt5/resources.html#using-resources-in-a-library -target_sources(mixxx PRIVATE $<TARGET_OBJECTS:mixxx-qrc>) -target_sources(mixxx-test PRIVATE $<TARGET_OBJECTS:mixxx-qrc>) +target_sources(mixxx PRIVATE res/mixxx.qrc) +set_target_properties(mixxx PROPERTIES AUTORCC ON) +target_sources(mixxx-test PRIVATE res/mixxx.qrc) +set_target_properties(mixxx-test PROPERTIES AUTORCC ON) file(READ src/_version.h MIXXX_VERSION_FILECONTENT) string(REGEX REPLACE "^.*#define MIXXX_VERSION \"(.*)\".*$" "\\1" MIXXX_VERSION "${MIXXX_VERSION_FILECONTENT}") |