fix(cmake): Fix smileys resource adding

.travis/build-ubuntu-14-04.sh

@@ -147,7 +147,7 @@ export PKG_CONFIG_PATH="$PWD/libs/lib/pkgconfig"
 
 # first build qTox without support for optional dependencies
 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
 make -j$(nproc)
 # clean it up, and build normal version

CMakeLists.txt

@@ -115,15 +115,21 @@ qt5_add_resources(
   DEPENDS ${${PROJECT_NAME}_QM_FILES}
 )
 
-if(NOT ${SMILEYS})
+if(NOT SMILEYS)
-  set(SMILEYS, "")
+  set(SMILEYS "")
 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()
 
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/translations.qrc.in"

qtox.pro

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