Merge pull request #13 from scipopt/simplify-version-in-conanfile

Simplify set_version in conanfile
scipopt · Oct 13, 2023 · 08ea089 · 08ea089
2 parents 0b57e89 + a7ad548
commit 08ea089
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/conanfile.py b/conanfile.py
@@ -26,7 +26,6 @@ class ScipPlusPlus(ConanFile):
         "shared": False,
         "fPIC": True
     }
-    _full_version: str = None
 
     @property
     def _min_cppstd(self):
@@ -64,12 +63,9 @@ def set_version(self):
         if self.version is None:
             git = Git(self, folder=self.recipe_folder)
             try:
-                self._full_version = git.run("describe --tags --dirty=-d").strip()
-                self.version = self._full_version.split('-')[0]
+                self.version = git.run("describe --tags --dirty=-d").strip()
             except:
-                self.version = "1.0.2"
-        else:
-            self._full_version = self.version
+                self.version = "1.x.y"
 
     def layout(self):
         cmake_layout(self)
@@ -81,7 +77,7 @@ def requirements(self):
 
     def generate(self):
         tc = CMakeToolchain(self)
-        tc.variables[self.name + "_version"] = self._full_version
+        tc.variables[self.name + "_version"] = self.version
         tc.variables["BUILD_TESTS"] = self.options.with_tests
         tc.generate()