Skip to content

Commit a9a3f32

Browse files
authored
(#11452) New glm version in recipes/glm/all/conandata.yml
Thanks Paul Harris for the hand-holding and bug hunting. * recipes/glm/all/conandata.yml (sources): Add a source for the latest commit of 20220420. * recipes/glm/config.yml: Also mention new version here. * recipes/glm/all/conanfile.py (GlmConan.package): Tweak for "cci.*" versions.
1 parent 9cc59e4 commit a9a3f32

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

recipes/glm/all/conandata.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
sources:
2+
"cci.20220420":
3+
url: "https://github.com/g-truc/glm/archive/cc98465e3508535ba8c7f6208df934c156a018dc.zip"
4+
sha256: "06d48e336857777d2d1f7da9ccd59e4b9d79720dbd70886d48837d19cda997bb"
25
"0.9.9.8":
36
url: "https://github.com/g-truc/glm/archive/0.9.9.8.tar.gz"
47
sha256: "7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592"

recipes/glm/all/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def source(self):
2626
destination=self._source_subfolder, strip_root=True)
2727

2828
def package(self):
29-
glm_version = tools.Version(self._get_semver())
29+
glm_version = self.version if self.version.startswith("cci") else tools.Version(self._get_semver())
3030
if glm_version == "0.9.8" or (glm_version == "0.9.9" and self._get_tweak_number() < 6):
3131
tools.save(os.path.join(self.package_folder, "licenses", "copying.txt"), self._get_license())
3232
else:

recipes/glm/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"cci.20220420":
3+
folder: all
24
"0.9.9.8":
35
folder: all
46
"0.9.9.7":

0 commit comments

Comments
 (0)