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
3139 commits 39 branches 37 tags 61 MiB
Commit graph

3139 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 3a10fe0e70 Try to use separate vs_versions 2021-03-07 11:14:49 +01:00
Rasmus Karlsson cd55e584a6 Update libcommuni fork version 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 900e1da868 Try to use windows-2016 for Qt 5.12.10 build on Windows 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 2757c2ae54 More windows directory path checks 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 5f6afe3d4f Move windeployqt stage down 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 b10a63f6d2 WINDOWS BUILD - more tree 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 8d9b5c1466 Update version of settings library 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 2607c07fc7 look at dir 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 167940e158 Try to fix macos openssl build 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 5418b142b3 Use same package method for windows cmake as windows qmake 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 cf5ec33c70 Remove cmake test build action 2021-03-07 11:14:49 +01:00
Rasmus Karlsson e4bc8574d7 Use nmake for cmake windows builds too 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 79b2a0d25b Go back to using nmake for qmake 2021-03-07 11:14:49 +01:00
Rasmus Karlsson feef041adf use boost filesystem for pajlada::settings on ubuntu 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 868ddce1bd make WinToast link PRIVATE 2021-03-07 11:14:49 +01:00
Rasmus Karlsson f03b23ccb1 Revert back to ubuntu-latest 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 004fdd5690 package macos cmake in old way 2021-03-07 11:14:49 +01:00
Rasmus Karlsson dfa2f14847 remove pwd/bin from LD_LIBRARY_PATH 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 83464ac74a move down again xd 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 865bab323f Disable package manager for Ubuntu build 
Disable package manager for macOS
 2021-03-07 11:14:48 +01:00
Rasmus Karlsson 57f53a6b37 Update CPack description & naming of chatterino/Chatterino/Chatterino 2 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 66b4c7d14c Remove lib/CMakeLists.txt file as it's no longer needed 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 314f48028d Revert project name back to just Chatterino 2021-03-07 11:12:09 +01:00
Rasmus Karlsson b2d0372ae6 Revert old test workflow changes 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 40aef53abe Add Threads dependency to tests 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 30ca3d6615 fix dependency names for the tests 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 7abed7e870 Update Linux build instructions for CMake 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 8c0dafd4cf Reformat BUILDING_WITH_CMAKE.md 2021-03-07 11:12:09 +01:00
Rasmus Karlsson 2728aafdf4 Test without conan again 2021-03-07 11:12:09 +01:00
Rasmus Karlsson f68f394eef Fix file casing for ircmodel.h 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 3a1220d07e reformat compile definitions 2021-03-07 11:12:09 +01:00
Rasmus Karlsson ef12debfd7 Don't define CMAKE_BUILD when not using system qt5keychain (or conan) 2021-03-07 11:12:09 +01:00
Rasmus Karlsson aacd331d80 fix OpenSSL target names 2021-03-07 11:12:09 +01:00
Rasmus Karlsson cc7c774b82 Fix boost target name 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