Commit graph

39 commits

Author SHA1 Message Date
Rasmus Karlsson e5186d1ce2 Merge all conanfiles backinto a single file 2021-03-07 11:57:10 +01:00
Rasmus Karlsson 303ff085eb Update comments in cmake files 2021-03-07 11:14:49 +01:00
Rasmus Karlsson cbe4564d55 Move MOC/RCC/UIC generation from global variables to target properties 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 0406bfc808 Clean up debug output 2021-03-07 11:14:49 +01:00
Rasmus Karlsson be7e5f644c Remove project line in src/ cmake file
This allows us to use PROJECT_VERSION instead in a 'global variable'
with the version
2021-03-07 11:14:49 +01:00
Rasmus Karlsson 58daf4e86a use list(APPEND) for mofiying the CMAKE_MODULE_PATH 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 9d6238687e Move property-changing from root CMakeLists.txt file to src/ one
Perform same properties cmake stuff on the tests project

Remove output directory stuff
2021-03-07 11:14:49 +01:00
Rasmus Karlsson 89fe70a77b Also link to Qt5::Core 2021-03-07 11:14:49 +01:00
Rasmus Karlsson c076a517c7 Move lib/libcommuni submodule to our cmake fork
Delete the temporary libcommuni-cmake submodule
2021-03-07 11:14:49 +01:00
Rasmus Karlsson 98cf183085 try to use set_target_properties to set the runtime output directory 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 4feffc671d Output cmake binary dir 2021-03-07 11:14:49 +01:00
Rasmus Karlsson dd23d4aee7 Unfix executable paths for windows 2021-03-07 11:14:49 +01:00
Rasmus Karlsson fec3150374 properly capitalize RapidJSON
include RapidJSON before Pajlada libs xd
2021-03-07 11:14:49 +01:00
Rasmus Karlsson 777d74fdfa Build and link qtkeychain statically 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 314f48028d Revert project name back to just Chatterino 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 3fddf31e16 Add missing line endings 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 2ccb3b190f Add librt for platforms that have the library (ubuntu only?) 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 440f3c5991 Add Threads package 2021-03-07 11:12:09 +01:00
Rasmus Karlsson e1f6679416 Add option to build qt5keychain from system 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 4c633a570f Add option to use system libcommuni (off by default, "old" behaviour) 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 3a9e101cd5 Add option to include Pajlada::Settings from the system 2021-03-07 11:12:09 +01:00
Rasmus Karlsson a592784dd4 Rename Settings to PajladaSettings 2021-03-07 11:12:08 +01:00
Rasmus Karlsson 3fb79abc0f Rename FindSignals to FindPajladaSignals 2021-03-07 11:12:08 +01:00
Rasmus Karlsson 757e5aca03 Rename FindSerialize to FindPajladaSerialize 2021-03-07 11:12:08 +01:00
Edgar 38b51d69bf 🎉 Added Cpack for building installer for windows 2021-03-07 11:12:08 +01:00
Edgar b1604a5acf 🎉 Added ccache and git values back 2021-03-07 11:12:08 +01:00
Edgar 0fe0a58373 👷 Fix CI build 2021-03-07 11:12:08 +01:00
Edgar 336044a840 👷 Fixed test CI build 2021-03-07 11:08:13 +01:00
Edgar 082b5e8b90 🔧 Cleanup build without conan 2021-03-07 11:08:13 +01:00
Edgar 9d8a607c4d 🎉 Added test back 2021-03-07 11:08:13 +01:00
Edgar 1a75f15498 🎉 Added support for building without Conan 2021-03-07 11:08:13 +01:00
Edgar 2df55138f8 🔧 Replaced find_libs with conan 2021-03-07 11:08:13 +01:00
Edgar 95b6879661 🚧 cmake build 2021-03-07 11:08:13 +01:00
pajlada 6b0ce396d6
Update to Emoji v13 (2020) (#1555) 2021-02-13 19:17:22 +01:00
pajlada 75b1ef06e2
Run tests in CI (#2310) 2020-12-26 23:40:47 +01:00
pajlada 0e66b17ff0
Add Network tests (#2304)
Also changes the way timeouts happen, since right now if a timeout was met (which it mostly wasn't), it would run the error callback twice causing potentially undefined behaviour
2020-12-26 12:42:39 +01:00
fanway 38966e2b19
Add option for truecase username autocompletion (#1883)
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
2020-12-20 16:43:35 +01:00
pajlada 0cbddf7e9b
Fix/be respectful of special characters like exclamation marks in highlight phrases since they are also word boundaries (#1890)
* Add missing includes

We would normally have these included in another file already, or even
the precompiled headers, but having the files included here too makes
testing single parts easier.

* Modify the regex building of highlight phrases for non-regex phrases

For phrases like !test, the word boundary checking we did before was not
enough, so we now check for either a word boundary, a whitespace
character, or the line start/end.

* Add tests for ensuring I haven't fully broken the highlight system

* Add changelog entry
2020-08-22 15:37:03 +02:00
Rasmus Karlsson cbd93f9537 Add tests for the UsernameSet and Prefix classes
How to build test:
mkdir build_test
cd build_test
cmake -DBUILD_TESTS=ON ..
make -j
Then to run the tests, use either:
make test
ctest
./chatterino-test
2019-05-11 14:17:52 +02:00