Commit graph

3160 commits

Author SHA1 Message Date
Rasmus Karlsson 90b08d503b add experimental cpack support (code by AnotherFoxGuy originally, just fiddled it into a separate PR/commit) 2021-03-07 15:59:23 +01:00
Rasmus Karlsson 4cf6ecaa4c add checklist for where to update the version 2021-03-07 15:57:17 +01:00
Rasmus Karlsson c623131b4b Remove package manager stuff from tests
figured out why discovering/adding tests to ctest doesn't work and added
a comment about it at the bottom of the tests cmakelists file
2021-03-07 15:41:02 +01:00
Rasmus Karlsson 4c883d38e8 remove more pmm stuff 2021-03-07 15:40:37 +01:00
Rasmus Karlsson b44f172854 Update settings library version 2021-03-07 14:51:23 +01:00
Rasmus Karlsson 6287daf8de Remove CPack code 2021-03-07 14:42:52 +01:00
Rasmus Karlsson 44c12661b7 Remove pmm
Simplify SourceFileUtils

Manually expand source/header files
2021-03-07 14:39:42 +01:00
Rasmus Karlsson 7cde0af973 CMAKE_BINARY_DIR no longer necessary as a CMAKE_MODULE_PATH 2021-03-07 13:26:01 +01:00
Rasmus Karlsson 36dddf389e Update cmake build instructions 2021-03-07 13:24:48 +01:00
Rasmus Karlsson 698d427dad Move git variable injection to its own file 2021-03-07 13:20:51 +01:00
Rasmus Karlsson 37eac393e6 remove tree call from macos packagE 2021-03-07 12:50:09 +01:00
Rasmus Karlsson 10ec47a099 Remove conan-pkgs folder 2021-03-07 12:47:27 +01:00
Rasmus Karlsson 12bd4fcda1 remove breakpad file again 2021-03-07 12:45:43 +01:00
Rasmus Karlsson 99eca92989 No longer copy dll as we compile qtkeychain statically 2021-03-07 12:38:04 +01:00
Rasmus Karlsson e5186d1ce2 Merge all conanfiles backinto a single file 2021-03-07 11:57:10 +01:00
Rasmus Karlsson 4e1cee6793 Add missing SplitCommand.hpp/cpp source file 2021-03-07 11:54:29 +01:00
Rasmus Karlsson 900bf87c20 reorder conanfile.txt includes 2021-03-07 11:14:49 +01:00
Rasmus Karlsson b982991328 Use boost filesystem for pajlada settings (new option name) 2021-03-07 11:14:49 +01:00
Rasmus Karlsson ce7f265718 Update version of settings library 2021-03-07 11:14:49 +01:00
Rasmus Karlsson 9799ccb182 Remove duplicate MacOS package step (qmake/cmake) 2021-03-07 11:14:49 +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 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