Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ctre: added releases up to 3.2 #3352

Merged
merged 3 commits into from
Nov 3, 2020
Merged

ctre: added releases up to 3.2 #3352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
384caf5
ctre: added releases up to 3.2
eigenwhat Oct 30, 2020
3864a68
ctre: updated minimum compiler check.
eigenwhat Nov 1, 2020
9927397
ctre: removed unnecessary patch versions.
eigenwhat Nov 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions recipes/ctre/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,21 @@ sources:
"2.8.2":
url: https://github.com/hanickadot/compile-time-regular-expressions/archive/v2.8.2.tar.gz
sha256: f89494f52ec31e5854fff3d2c5825474201476636c5d82a9365dad5188396314
"2.8.4":
url: https://github.com/hanickadot/compile-time-regular-expressions/archive/v2.8.4.tar.gz
sha256: 99b981857f1b66cab5e71161ae74deca268ed39a96ec6507def92d4f445cadd6
"2.9.2":
url: https://github.com/hanickadot/compile-time-regular-expressions/archive/v2.9.2.tar.gz
sha256: 763cb6f26e6fc68b4c98a809efbf55aab1a21c7773da8150d41c31baf5f8b711
"2.10":
url: https://github.com/hanickadot/compile-time-regular-expressions/archive/v2.10.tar.gz
sha256: 2e166b672c5a733b5448bb9fc83db54d92852c39e3e19097b79307cc6a327c31
"3.0.1":
url: https://github.com/hanickadot/compile-time-regular-expressions/archive/v3.0.1.tar.gz
sha256: 0838ce0af9e9e89ffc10854dc98c88b2dd40d1866ceaf0dc6c1663d6c39882cc
"3.1":
url: https://github.com/hanickadot/compile-time-regular-expressions/archive/v3.1.tar.gz
sha256: c209ab0533b56a4fbbc7959e10c91c89fe2c9cb1725b64ed52be272a534a1d83
"3.2":
url: https://github.com/hanickadot/compile-time-regular-expressions/archive/v3.2.tar.gz
sha256: d4e734e3dd501f741424aceb5198f5ebbc35c624335c99f7e202a9ecb31cd3e6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is quite excessive. Please only add versions you actually need

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've cut out all but the latest of each major/minor.

5 changes: 3 additions & 2 deletions recipes/ctre/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ def _validate_compiler_settings(self):
compiler = self.settings.compiler
version = tools.Version(self.settings.compiler.version)

min_gcc = "7.4" if self.version < "3" else "8"
if self.settings.compiler.get_safe("cppstd"):
tools.check_min_cppstd(self, "17")
if compiler == "Visual Studio" and version < "15":
raise ConanInvalidConfiguration("ctre doesn't support MSVC < 15")
elif compiler == "gcc" and version < "7.4":
raise ConanInvalidConfiguration("ctre doesn't support gcc < 7.4")
elif compiler == "gcc" and version < min_gcc:
raise ConanInvalidConfiguration("ctre doesn't support gcc < {}".format(min_gcc))
elif compiler == "clang" and version < "6.0":
raise ConanInvalidConfiguration("ctre doesn't support clang < 6.0")
elif compiler == "apple-clang" and version < "10.0":
Expand Down
2 changes: 1 addition & 1 deletion recipes/ctre/all/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.11)
cmake_minimum_required(VERSION 3.1)
project(PackageTest CXX)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
Expand Down
12 changes: 12 additions & 0 deletions recipes/ctre/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,15 @@
versions:
"2.8.2":
folder: all
"2.8.4":
folder: all
"2.9.2":
folder: all
"2.10":
folder: all
"3.0.1":
folder: all
"3.1":
folder: all
"3.2":
folder: all