@@ -18,12 +18,6 @@ class CloeSimulatorVTD(ConanFile):
18
18
description = "Cloe simulator plugin that binds to Vires VTD"
19
19
license = "Apache-2.0"
20
20
settings = "os" , "compiler" , "build_type" , "arch"
21
- options = {
22
- "pedantic" : [True , False ],
23
- }
24
- default_options = {
25
- "pedantic" : True ,
26
- }
27
21
generators = "CMakeDeps" , "VirtualRunEnv"
28
22
no_copy_source = True
29
23
exports_sources = [
@@ -37,6 +31,8 @@ class CloeSimulatorVTD(ConanFile):
37
31
_setup_folder = "contrib/setups"
38
32
39
33
def set_version (self ):
34
+ # Check for both VERSION and ../../VERSION because when building inside
35
+ # Docker only the plugin directory is exported.
40
36
for version_path in ["VERSION" , "../../VERSION" ]:
41
37
version_file = Path (self .recipe_folder ) / version_path
42
38
if version_file .exists ():
@@ -73,7 +69,7 @@ def reset(tarinfo):
73
69
74
70
if not dir .is_dir ():
75
71
return
76
- # Compressing will add a timestamp to the package and therefore
72
+ # Compressing will add a timestamp to the package and therefore
77
73
# leads to different package_hashes everytime we export with conan.
78
74
# To avoid that, changing from .tgz to .tar was necessary
79
75
with tarfile .open (f"{ dir .name } .tar" , "w:" ) as tar :
@@ -107,7 +103,6 @@ def generate(self):
107
103
tc = cmake .CMakeToolchain (self )
108
104
tc .cache_variables ["CMAKE_EXPORT_COMPILE_COMMANDS" ] = True
109
105
tc .cache_variables ["CLOE_PROJECT_VERSION" ] = self .version
110
- tc .cache_variables ["TargetLintingExtended" ] = self .options .pedantic
111
106
tc .generate ()
112
107
113
108
def build (self ):
@@ -145,8 +140,5 @@ def package_info(self):
145
140
self .cpp_info .set_property ("cmake_find_mode" , "both" )
146
141
self .cpp_info .set_property ("cmake_file_name" , "cloe-plugin-vtd" )
147
142
self .cpp_info .set_property ("pkg_config_name" , "cloe-plugin-vtd" )
148
- self .env_info .VTD_LAUNCH = f"{ self .package_folder } /bin/vtd-launch"
149
- self .env_info .VTD_SETUP_DIR = f"{ self .package_folder } /{ self ._setup_folder } "
150
-
151
- def package_id (self ):
152
- del self .info .options .pedantic
143
+ self .runenv_info .define ("VTD_LAUNCH" , f"{ self .package_folder } /bin/vtd-launch" )
144
+ self .runenv_info .define ("VTD_SETUP_DIR" , f"{ self .package_folder } /{ self ._setup_folder } " )
0 commit comments