StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix: don't link emoji resources into targets that don't need them

Browse Source 
The emoji resouce file is quite big, so link it only when really needed.
This commit is contained in:
sudden6 2022-02-23 22:04:02 +01:00
parent aeb8a9aca1
commit cd8af735fc
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -181,17 +181,15 @@ if(NOT SMILEYS)
set(SMILEYS "") set(SMILEYS "")
endif() endif()
set(SMILEY_RESOURCES "")
if(NOT "${SMILEYS}" STREQUAL "DISABLED") if(NOT "${SMILEYS}" STREQUAL "DISABLED")
set(${PROJECT_NAME}_RESOURCES set(SMILEY_RESOURCES smileys/emojione.qrc)
${${PROJECT_NAME}_RESOURCES}
smileys/emojione.qrc)
if(NOT "${SMILEYS}" STREQUAL "MIN") if(NOT "${SMILEYS}" STREQUAL "MIN")
set(${PROJECT_NAME}_RESOURCES set(SMILEY_RESOURCES
${${PROJECT_NAME}_RESOURCES} ${SMILEY_RESOURCES}
smileys/smileys.qrc) smileys/smileys.qrc)
endif() endif()
endif() endif()
set(${PROJECT_NAME}_SOURCES set(${PROJECT_NAME}_SOURCES
@ -662,6 +660,7 @@ add_executable(${PROJECT_NAME}
WIN32 WIN32
MACOSX_BUNDLE MACOSX_BUNDLE
${${PROJECT_NAME}_RESOURCES} ${${PROJECT_NAME}_RESOURCES}
${SMILEY_RESOURCES}
src/main.cpp) src/main.cpp)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
${PROJECT_NAME}_static ${PROJECT_NAME}_static

2
cmake/Testing.cmake
View File

@ -51,7 +51,7 @@ auto_test(persistence paths "")
auto_test(persistence dbschema "") auto_test(persistence dbschema "")
auto_test(persistence offlinemsgengine "") auto_test(persistence offlinemsgengine "")
if(NOT "${SMILEYS}" STREQUAL "DISABLED") if(NOT "${SMILEYS}" STREQUAL "DISABLED")
auto_test(persistence smileypack "${${PROJECT_NAME}_RESOURCES}") # needs emojione auto_test(persistence smileypack "${SMILEY_RESOURCES}") # needs emojione
endif() endif()
auto_test(model friendlistmanager "") auto_test(model friendlistmanager "")
auto_test(model friendmessagedispatcher "") auto_test(model friendmessagedispatcher "")