From 3924861a3da6308cd8ee5e108c4c21884cfc81b3 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sun, 20 Nov 2022 12:26:28 +0100 Subject: [PATCH] Fix Linux CMake build for old installs (#4167) --- CHANGELOG.md | 2 +- cmake/resources/generate_resources.cmake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3dde872..a893e792 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -132,7 +132,7 @@ - Dev: Batched checking live status for all channels after startup. (#3757, #3762, #3767) - Dev: Moved most command context into the command controller. (#3824) - Dev: Error NetworkResults now include the body data. (#3987) -- Dev: Automatically generate resources files with cmake. (#4159) +- Dev: Automatically generate resources files with cmake. (#4159, #4167) ## 2.3.5 diff --git a/cmake/resources/generate_resources.cmake b/cmake/resources/generate_resources.cmake index 5acf1065..048d81f9 100644 --- a/cmake/resources/generate_resources.cmake +++ b/cmake/resources/generate_resources.cmake @@ -8,11 +8,13 @@ set( resources_autogenerated.qrc windows.rc ) +set(RES_IMAGE_EXCLUDE_FILTER ^linuxinstall/) file(GLOB_RECURSE RES_ALL_FILES RELATIVE "${RES_DIR}" LIST_DIRECTORIES false CONFIGURE_DEPENDS "${RES_DIR}/*") file(GLOB_RECURSE RES_IMAGE_FILES RELATIVE "${RES_DIR}" LIST_DIRECTORIES false CONFIGURE_DEPENDS "${RES_DIR}/*.png") list(REMOVE_ITEM RES_ALL_FILES ${RES_IGNORED_FILES}) +list(FILTER RES_IMAGE_FILES EXCLUDE REGEX ${RES_IMAGE_EXCLUDE_FILTER}) ############################### # Generate resources_autogenerated.qrc @@ -79,4 +81,4 @@ set(RES_AUTOGEN_FILES "${CMAKE_SOURCE_DIR}/resources/resources_autogenerated.qrc" "${CMAKE_BINARY_DIR}/autogen/ResourcesAutogen.cpp" "${CMAKE_BINARY_DIR}/autogen/ResourcesAutogen.hpp" - ) \ No newline at end of file + )