Skip to content

Commit cea763a

Browse files
committed
fable: Set version to project version from conanfile.py
It turns out fable is not yet at version 1.0 after all. Until fable becomes a lot more stable and tested, we'll go with the Cloe project version.
1 parent 67fec7e commit cea763a

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

fable/CMakeLists.txt

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
22

3-
project(fable
4-
VERSION 1.0.0
5-
LANGUAGES CXX
6-
)
3+
project(fable LANGUAGES CXX)
74

85
set(target fable)
96
set(alias fable::fable)
@@ -29,7 +26,7 @@ add_library(${alias} ALIAS ${target})
2926
set_target_properties(${target} PROPERTIES
3027
CXX_STANDARD 14
3128
CXX_STANDARD_REQUIRED ON
32-
VERSION ${PROJECT_VERSION}
29+
VERSION ${FABLE_VERSION}
3330
)
3431
target_include_directories(${target}
3532
PUBLIC

fable/conanfile.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import os
2-
1+
import os.path
32
from conans import ConanFile, CMake, tools
43

54

65
class Fable(ConanFile):
76
name = "fable"
8-
version = "1.0.0"
97
license = "Apache-2.0"
108
url = "https://github.com/eclipse/cloe"
119
description = "JSON schema and configuration library"
@@ -35,6 +33,13 @@ class Fable(ConanFile):
3533

3634
_cmake = None
3735

36+
def _project_version(self):
37+
version_file = os.path.join(self.recipe_folder, "..", "VERSION")
38+
return tools.load(version_file).strip()
39+
40+
def set_version(self):
41+
self.version = self._project_version()
42+
3843
def build_requirements(self):
3944
if self.options.test:
4045
self.build_requires("gtest/[~1.10]")
@@ -44,6 +49,7 @@ def _configure_cmake(self):
4449
return self._cmake
4550
self._cmake = CMake(self)
4651
self._cmake.definitions["CMAKE_EXPORT_COMPILE_COMMANDS"] = True
52+
self._cmake.definitions["FABLE_VERSION"] = self.version
4753
self._cmake.definitions["BuildTests"] = self.options.test
4854
self._cmake.configure()
4955
return self._cmake

runtime/conanfile.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class CloeRuntime(ConanFile):
3333
"inja/[~=3.0.0]",
3434
"spdlog/[~=1.5.0]",
3535
"incbin/[~=1.74.0]@cloe/stable",
36-
"fable/1.0.0@cloe/develop",
3736
]
3837

3938
_cmake = None
@@ -45,6 +44,9 @@ def _project_version(self):
4544
def set_version(self):
4645
self.version = self._project_version()
4746

47+
def requirements(self):
48+
self.requires("fable/{}@cloe/develop".format(self.version))
49+
4850
def build_requirements(self):
4951
if self.options.test:
5052
self.build_requires("gtest/[~1.10]")

0 commit comments

Comments
 (0)