noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

✅ Added Emojis test back

Browse source
This commit is contained in:
Edgar 2021-02-14 10:55:32 +01:00 committed by Rasmus Karlsson
parent 78f1d22b21
commit d5c886c8ee
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conanfile.txt
View file

@ -10,6 +10,7 @@ settings/0.1@chatterino/local
signals/0.1@chatterino/local signals/0.1@chatterino/local
WebSocketpp/0.8.1@chatterino/local WebSocketpp/0.8.1@chatterino/local
[generators] [generators]
cmake cmake

13
tests/CMakeLists.txt
View file

@ -19,6 +19,13 @@ set(chatterino_SOURCES
${main_dir}/BaseSettings.cpp ${main_dir}/BaseSettings.cpp
${main_dir}/common/UsernameSet.cpp ${main_dir}/common/UsernameSet.cpp
${main_dir}/controllers/highlights/HighlightPhrase.cpp ${main_dir}/controllers/highlights/HighlightPhrase.cpp
${main_dir}/providers/emoji/Emojis.cpp
${main_dir}/messages/Emote.cpp
${main_dir}/messages/Image.cpp
${main_dir}/messages/ImageSet.cpp
${main_dir}/util/RapidjsonHelpers.cpp
${CMAKE_SOURCE_DIR}/resources/resources.qrc
${CMAKE_SOURCE_DIR}/resources/resources_autogenerated.qrc
) )
message("++ Tests enabled") message("++ Tests enabled")
@ -29,6 +36,7 @@ add_executable(${PROJECT_NAME}
src/NetworkRequest.cpp src/NetworkRequest.cpp
src/UsernameSet.cpp src/UsernameSet.cpp
src/HighlightPhrase.cpp src/HighlightPhrase.cpp
src/Emojis.cpp
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
@ -54,7 +62,8 @@ else ()
) )
endif () endif ()
target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO UNICODE USEWINSDK AB_CUSTOM_THEME AB_CUSTOM_SETTINGS IRC_STATIC IRC_NAMESPACE=Communi) target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO CHATTERINO_TEST UNICODE USEWINSDK AB_CUSTOM_THEME AB_CUSTOM_SETTINGS IRC_STATIC IRC_NAMESPACE=Communi)
target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO_GIT_HASH=\"XD\" CHATTERINO_GIT_RELEASE=\"XD\" CHATTERINO_GIT_COMMIT=\"XD\") target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO_GIT_HASH=\"XD\" CHATTERINO_GIT_RELEASE=\"XD\" CHATTERINO_GIT_COMMIT=\"XD\")
gtest_discover_tests(${PROJECT_NAME})
#gtest_discover_tests(${PROJECT_NAME})