File tree Expand file tree Collapse file tree 2 files changed +12
-7
lines changed Expand file tree Collapse file tree 2 files changed +12
-7
lines changed Original file line number Diff line number Diff line change 1
1
[deps ]
2
2
BinaryBuilder = " 12aac903-9f7c-5d81-afc2-d9565ea332ae"
3
3
CEnum = " fa961155-64e5-5f13-b03f-caf6b980ea82"
4
- CMake = " 631607c0-34d2-5d66-819e-eb0f9aa2061a "
4
+ CMake_jll = " 3f4e10e2-61f2-5801-8945-23b9d642d0e6 "
5
5
Libdl = " 8f399da3-3557-5675-b5ff-fb832c97cbdb"
6
+ TOML = " fa267f1f-6049-4f14-aa54-33bafae1ed76"
6
7
Tar = " a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
7
8
Test = " 8dfed614-e22c-5e08-85e1-65c5234f0b40"
8
9
p7zip_jll = " 3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
9
- TOML = " fa267f1f-6049-4f14-aa54-33bafae1ed76"
Original file line number Diff line number Diff line change 1
- using CMake , p7zip_jll, Tar
1
+ using CMake_jll , p7zip_jll, Tar
2
2
using Clang. Generators
3
3
4
4
function build_libbitfield_native ()
@@ -8,7 +8,8 @@ function build_libbitfield_native()
8
8
src_dir = joinpath (@__DIR__ , " bitfield" )
9
9
build_dir = joinpath (@__DIR__ , " build" )
10
10
11
- config_cmd = ` $cmake -B $build_dir -S $src_dir `
11
+ cmake_path = CMake_jll. get_cmake_path ()
12
+ config_cmd = ` $cmake_path -B $build_dir -S $src_dir `
12
13
if Sys. WORD_SIZE == 32
13
14
if Sys. iswindows ()
14
15
config_cmd = ` $config_cmd -A win32`
@@ -19,9 +20,13 @@ function build_libbitfield_native()
19
20
build_cmd = ` $cmake --build $build_dir --config Debug`
20
21
install_cmd = ` $cmake --install $build_dir --config Debug --prefix $build_dir `
21
22
22
- run (config_cmd)
23
- run (build_cmd)
24
- run (install_cmd)
23
+ # This will show a warning about the do-block method being deprecated,
24
+ # but not using it throws an error about libssl not being found.
25
+ cmake () do _
26
+ run (config_cmd)
27
+ run (build_cmd)
28
+ run (install_cmd)
29
+ end
25
30
catch e
26
31
@warn " Building libbitfield with native tools failed" exception= (e, catch_backtrace ())
27
32
success = false
You can’t perform that action at this time.
0 commit comments