File tree Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Original file line number Diff line number Diff line change 51
51
- platform : windows-arm64
52
52
os : windows-11-arm
53
53
conan_profile : msvc-arm64
54
+ conan_options : -o "&:lua_lib=lua"
54
55
runs-on : ${{ matrix.os }}
55
56
defaults :
56
57
run :
@@ -158,6 +159,7 @@ jobs:
158
159
159
160
# TODO: remove LuaJIT when https://github.com/conan-io/conan-center-index/pull/26577 is merged
160
161
- name : Build LuaJIT from PR changes
162
+ if : ${{ !contains(matrix.conan_options, '"&:lua_lib=lua"') }}
161
163
run : |
162
164
cciForkRepo='cci-fork'
163
165
branchName='vcmi'
Original file line number Diff line number Diff line change @@ -15,7 +15,6 @@ class VCMI(ConanFile):
15
15
generators = "CMakeDeps"
16
16
17
17
_libRequires = [
18
- "luajit/2.1.0-beta3" ,
19
18
"minizip/[^1.2.12]" ,
20
19
"zlib/[^1.2.12]" ,
21
20
]
@@ -33,10 +32,12 @@ class VCMI(ConanFile):
33
32
options = {
34
33
"target_pre_windows10" : [True , False ],
35
34
"with_ffmpeg" : [True , False ],
35
+ "lua_lib" : [None , "luajit" , "lua" ]
36
36
}
37
37
default_options = {
38
38
"target_pre_windows10" : False ,
39
39
"with_ffmpeg" : True ,
40
+ "lua_lib" : "luajit" ,
40
41
}
41
42
42
43
def config_options (self ):
@@ -62,6 +63,14 @@ def requirements(self):
62
63
else :
63
64
self .requires (f"boost/[^{ boostMinVersion } ]" )
64
65
66
+ if self .options .lua_lib :
67
+ lib = str (self .options .lua_lib )
68
+ libVersion = {
69
+ "lua" : "[^5.4.7]" ,
70
+ "luajit" : "2.1.0-beta3" ,
71
+ }.get (lib )
72
+ self .requires (f"{ lib } /{ libVersion } " )
73
+
65
74
# client
66
75
if self .options .with_ffmpeg :
67
76
self .requires ("ffmpeg/[>=4.4]" )
You can’t perform that action at this time.
0 commit comments