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(cmake): Fix smileys resource adding

Browse Source
This commit is contained in:
Diadlo 2017-01-07 00:45:40 +03:00
parent 3f926fa602
commit fddda5de61
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/build-ubuntu-14-04.sh
View File

@ -147,7 +147,7 @@ export PKG_CONFIG_PATH="$PWD/libs/lib/pkgconfig"
# first build qTox without support for optional dependencies # first build qTox without support for optional dependencies
echo '*** BUILDING "MINIMAL" VERSION ***' echo '*** BUILDING "MINIMAL" VERSION ***'
qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO DISABLE_PLATFORM_EXT=YES SMILEYS=NO qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO DISABLE_PLATFORM_EXT=YES SMILEYS=DISABLED
# ↓ reduce if build fails with OOM # ↓ reduce if build fails with OOM
make -j$(nproc) make -j$(nproc)
# clean it up, and build normal version # clean it up, and build normal version

18
CMakeLists.txt
View File

@ -115,15 +115,21 @@ qt5_add_resources(
DEPENDS ${${PROJECT_NAME}_QM_FILES} DEPENDS ${${PROJECT_NAME}_QM_FILES}
) )
if(NOT ${SMILEYS}) if(NOT SMILEYS)
set(SMILEYS, "") set(SMILEYS "")
endif() endif()
if(NOT ${SMILEYS} MATCHES "NO") if(NOT "${SMILEYS}" STREQUAL "DISABLED")
qt5_add_resources(smileys/emojione.qrc) qt5_add_resources(
if(NOT ${SMILEYS} MATCHES "MIN") ${PROJECT_NAME}_RESOURCES
qt5_add_resources(smileys/smileys.qrc) smileys/emojione.qrc)
if(NOT "${SMILEYS}" STREQUAL "MIN")
qt5_add_resources(
${PROJECT_NAME}_RESOURCES
smileys/smileys.qrc)
endif() endif()
endif() endif()
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/translations.qrc.in" file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/translations.qrc.in"

2
qtox.pro
View File

@ -406,7 +406,7 @@ freebsd {
RESOURCES += res.qrc \ RESOURCES += res.qrc \
translations/translations.qrc translations/translations.qrc
!contains(SMILEYS, NO) { !contains(SMILEYS, DISABLED) {
RESOURCES += smileys/emojione.qrc RESOURCES += smileys/emojione.qrc
!contains(SMILEYS, MIN) { !contains(SMILEYS, MIN) {
RESOURCES += smileys/smileys.qrc RESOURCES += smileys/smileys.qrc