File tree 3 files changed +8
-7
lines changed
3 files changed +8
-7
lines changed Original file line number Diff line number Diff line change 12
12
13
13
env :
14
14
# TODO: detect this from repo somehow: https://github.com/halide/Halide/issues/8406
15
- LLVM_VERSION : 19.1.4
15
+ LLVM_VERSION : 19.1.6
16
16
FLATBUFFERS_VERSION : 23.5.26
17
17
WABT_VERSION : 1.0.36
18
18
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ function(_Halide_install_pkgdeps)
80
80
set (depFile "${CMAKE_CURRENT_BINARY_DIR} /${ARG_FILE_NAME} " )
81
81
82
82
_Halide_install_code(
83
- "file(READ \"\$ {CMAKE_INSTALL_PREFIX}/${ARG_DESTINATION} /${ARG_EXPORT_FILE} \" target_cmake)"
83
+ "file(READ \"\$ ENV{DESTDIR} \$ {CMAKE_INSTALL_PREFIX}/${ARG_DESTINATION} /${ARG_EXPORT_FILE} \" target_cmake)"
84
84
"file(WRITE \" ${depFile} .in\" \"\" )"
85
85
)
86
86
@@ -104,4 +104,4 @@ function(_Halide_install_pkgdeps)
104
104
DESTINATION "${ARG_DESTINATION} "
105
105
COMPONENT "${ARG_COMPONENT} "
106
106
)
107
- endfunction ()
107
+ endfunction ()
Original file line number Diff line number Diff line change @@ -18,17 +18,18 @@ set(Halide_VERSION_OVERRIDE "${Halide_VERSION}"
18
18
CACHE STRING "VERSION to set for custom Halide packaging" )
19
19
mark_as_advanced (Halide_VERSION_OVERRIDE)
20
20
21
- if (Halide_VERSION_OVERRIDE)
22
- # Empty is considered a value distinct from not-defined
21
+ if (NOT Halide_VERSION_OVERRIDE STREQUAL "" )
22
+ # CMake treats an empty VERSION property differently from leaving it unset.
23
+ # We also can't check the boolean-ness of Halide_VERSION_OVERRIDE because
24
+ # VERSION 0 is valid. See: https://github.com/halide/Halide/issues/8522
23
25
set_target_properties (Halide PROPERTIES VERSION "${Halide_VERSION_OVERRIDE} " )
24
26
endif ()
25
27
26
28
set (Halide_SOVERSION_OVERRIDE "${Halide_VERSION_MAJOR} "
27
29
CACHE STRING "SOVERSION to set for custom Halide packaging" )
28
30
mark_as_advanced (Halide_SOVERSION_OVERRIDE)
29
31
30
- if (Halide_SOVERSION_OVERRIDE)
31
- # Empty is considered a value distinct from not-defined
32
+ if (NOT Halide_SOVERSION_OVERRIDE STREQUAL "" )
32
33
set_target_properties (Halide PROPERTIES SOVERSION "${Halide_SOVERSION_OVERRIDE} " )
33
34
endif ()
34
35
You can’t perform that action at this time.
0 commit comments