Commit Graph

35 Commits

Author SHA1 Message Date
Devon Adair
62d4aecb8c
Conan v2 (#2805)
* Removed Conan1 build.py file using conan package tools that are no longer supported

* Working conan 1 and 2 build with the test package. 

updated the test_package to be updated to conan 2 and fixed missing cmake. Still need to check that the license file is packaged up and that the packages look identical before the changes

* Removing debug prints and the license check that isn't working yet

* Working license file copied over as it was before

* Migrated the properties of cpp_info to conan 2. Keeping conan 1 support by checking the version of conan

https://docs.conan.io/1/migrating_to_2.0/properties.html

* Revert "Removed Conan1 build.py file using conan package tools that are no longer supported"

This reverts commit a606d1dfe6.

* Need to add a set_version to parse the version from CMakeLists.txt

Adding a package build yaml to ensure conan keeps building on 1 and 2

* Setting lowercase catch2 for pkg_config and cmake_target_name

* Fixing the namespace for conan file cmake_target_name
2024-02-17 16:42:44 +01:00
Mike Crowe
4db8b50aab
Add support for building with Meson (#2530)
The Meson[1] build system makes it easier incorporate third-party
libaries into a project if they also build using Meson.

Let's add a minimal Meson build that's compatible with the CMake build,
along with a GitHub workflow to check that it builds and that at least
the simplest SelfTest runs.

The handling of catch_user_config.hpp is inspired by BUILD.bazel and
doesn't attempt to support any configuratons options. Such features
could be added later.

Meson strongly discourages using wildcards to specify sources, so the
source and header lists are copied from CMakeLists.txt.

Add a new test workflow to test the Meson builds. I was unable to get
these tests to pass with Ubuntu 20.04, so they use Ubuntu 22.04.

I'm neither a CMake nor a Meson expert, but the results seem to work for
me.

[1] https://mesonbuild.com/

Co-authored-by: Mike Crowe <mcrowe@brightsign.biz>
2022-10-01 23:28:30 +02:00
Raphael Schaller
f993b702c6 extend gitignore 2022-07-16 16:16:05 +02:00
Martin Hořeňovský
b84067ea6f
Clean up .gitignore 2022-05-01 23:10:37 +02:00
Rodrigo Severo
ce556fd646 Ignoring VSCode settings dir 2022-01-15 15:45:56 +01:00
Clare Macrae
4035beb988 Add a script - buildAndTest.sh
This contains the currently-documented steps for a developer build.
Also, make git ignore its output directory.
2020-10-28 11:38:06 +01:00
Paul Dreik
0098a76fef first take basing fuzz on v3 2020-10-07 17:38:27 +02:00
Valentin Tolmer
d05a8e2e24 Add Bazel support for the v3 branch 2020-05-26 14:49:49 +02:00
Uilian Ries
ac0a83a35d Update Conan recipe
- Apply new conventions introduced on Conan 1.8
- Removed outdated settings
- Update license to follow SPDX format

Closes #926
Closes #943
2018-11-19 15:27:47 +01:00
Phil Nash
2c43620d9b Exclude benchmark dir 2018-01-05 14:39:59 +00:00
Phil Nash
c39109dce3 Ignore all cmake-build-* folders 2017-11-21 11:08:39 +00:00
philsquared
aa28196e8b Ignore .vs folder 2017-02-21 08:52:08 +00:00
Phil Nash
7bb3e859aa Removed all manually maintained project files in favour of instructions on how to use CMake to generate them 2017-01-09 17:38:42 +00:00
Phil Nash
e1fbbe1590 Added headers to CMake project (for CLion) 2017-01-06 16:59:18 +00:00
Phil Nash
c8fefc4670 Fixed Travis and CMake after moving CMakeLists.txt 2017-01-06 16:19:20 +00:00
Phil Nash
f9afa2a68d Ignore CMake and CLion generated files 2016-11-29 11:27:22 +00:00
Phil Nash
a21fb80edb Ignore *.xccheckout 2015-03-27 17:55:13 +00:00
Phil Nash
6c4a7cdd64 Renamed XCode4 folder to just XCode
(It’s been Xcode 5 for a long time, now, anyway)
2014-04-17 07:38:10 +01:00
Phil Nash
5b15c21c9c Fixed iTChRunner 2013-06-12 19:05:21 +01:00
Phil Nash
26ae11774b First draft of future opt parser lib 2013-04-27 12:26:13 +01:00
Phil Nash
707c97ed3e Ignore OCTest DerivedData 2013-02-18 13:02:23 +00:00
Phil Nash
bcf722eb81 Reporter interface uses value types instead of shared ptrs again 2013-01-03 09:04:46 +00:00
Phil Nash
8a2bfc3ab6 Updated .gitignore 2012-12-09 11:21:50 +00:00
Phil Nash
daedf8ff5f Minimal changes to get iTchRunner to work again 2012-12-06 18:39:08 +00:00
Phil Nash
c81bf7b7a2 Updated gitignore 2012-05-23 23:55:32 +01:00
Phil Nash
7ec6d27000 Ignored some more files 2012-03-19 08:25:06 +00:00
Phil Nash
af8d0b3955 Fixed trim() for single char strings (github #75) 2012-02-28 20:04:25 +00:00
Phil Nash
0b09d1c089 Fixed GitHub Issue #70
Interleave XML entities are now encoded correctly
2012-02-10 18:58:06 +00:00
Phil Nash
a162e22fa3 Added CHECKED_IF and CHECKED_ELSE 2012-02-10 08:30:13 +00:00
Phil Nash
8152825e9f Fixed Obj-C related #include ordering 2011-08-15 09:06:31 +01:00
Phil Nash
823ea3efd4 Re-org 2011-04-26 08:32:40 +01:00
Phil Nash
4d613f1f9e Added XCode 4 related extension to be ignored 2011-03-21 12:21:50 +00:00
Phil Nash
635216e2c6 Move the Xcode project around a bit 2010-11-13 09:39:45 +00:00
Phil Nash
d8aa843c7d Added Visual Studio project and fixed up some warnings showing in VS 2010-11-12 19:32:13 +00:00
Phil Nash
d80260001b First commit for GitHub 2010-11-09 23:24:00 +00:00