Skip to content

Commit

Permalink
(#21792) Catch2 cpp17 onwards not compatible with cpp14
Browse files Browse the repository at this point in the history
* Build Catch2 with support for C++17 and beyond

* Cap the minimum cpp std to 14 or greater

* Clean up

* Use new extension_properties for cppstd compatibility, and bump required conan version

* Update recipes/catch2/3.x.x/conanfile.py

Co-authored-by: Martin Valgur <[email protected]>

* Update recipes/catch2/3.x.x/conanfile.py

---------

Co-authored-by: Martin Valgur <[email protected]>
Co-authored-by: Luis Caro Campos <[email protected]>
  • Loading branch information
3 people authored May 2, 2024
1 parent 30f107c commit 6b3de62
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion recipes/catch2/3.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import os
import textwrap

required_conan_version = ">=1.53.0"
required_conan_version = ">=1.53.0 <2 || >=2.1.0"


class Catch2Conan(ConanFile):
Expand Down Expand Up @@ -35,6 +35,9 @@ class Catch2Conan(ConanFile):
"console_width": "80",
"no_posix_signals": False,
}
# disallow cppstd compatibility, as it affects the ABI in this library
# see https://github.com/conan-io/conan-center-index/issues/19008
extension_properties = {"compatibility_cppstd": False}

@property
def _min_cppstd(self):
Expand Down

0 comments on commit 6b3de62

Please sign in to comment.