chatterino2
Code Issues

Fix Linux CMake build for old installs (#4167)

Browse Source
This commit is contained in:
pajlada
2022-11-20 12:26:28 +01:00
committed by GitHub
parent 768b281ff2
commit 3924861a3d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1 -1
View File
@@ -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
cmake/resources/generate_resources.cmake
+3 -1
View File
@@ -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"
)
)