Skip to content

Commit ac2cd23

Browse files
authored
Fix Debian packaging (#8524)
* Handle DESTDIR in HalidePackageConfigHelpers.cmake Fixes #8521 * Fix Halide_[SO]VERSION_OVERRIDE when value is 0 Fixes #8522 * Upgrade LLVM to 19.1.6
1 parent d3f19bd commit ac2cd23

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/pip.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
env:
1414
# 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
1616
FLATBUFFERS_VERSION: 23.5.26
1717
WABT_VERSION: 1.0.36
1818

cmake/HalidePackageConfigHelpers.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function(_Halide_install_pkgdeps)
8080
set(depFile "${CMAKE_CURRENT_BINARY_DIR}/${ARG_FILE_NAME}")
8181

8282
_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)"
8484
"file(WRITE \"${depFile}.in\" \"\")"
8585
)
8686

@@ -104,4 +104,4 @@ function(_Halide_install_pkgdeps)
104104
DESTINATION "${ARG_DESTINATION}"
105105
COMPONENT "${ARG_COMPONENT}"
106106
)
107-
endfunction()
107+
endfunction()

src/CMakeLists.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@ set(Halide_VERSION_OVERRIDE "${Halide_VERSION}"
1818
CACHE STRING "VERSION to set for custom Halide packaging")
1919
mark_as_advanced(Halide_VERSION_OVERRIDE)
2020

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
2325
set_target_properties(Halide PROPERTIES VERSION "${Halide_VERSION_OVERRIDE}")
2426
endif ()
2527

2628
set(Halide_SOVERSION_OVERRIDE "${Halide_VERSION_MAJOR}"
2729
CACHE STRING "SOVERSION to set for custom Halide packaging")
2830
mark_as_advanced(Halide_SOVERSION_OVERRIDE)
2931

30-
if (Halide_SOVERSION_OVERRIDE)
31-
# Empty is considered a value distinct from not-defined
32+
if (NOT Halide_SOVERSION_OVERRIDE STREQUAL "")
3233
set_target_properties(Halide PROPERTIES SOVERSION "${Halide_SOVERSION_OVERRIDE}")
3334
endif ()
3435

0 commit comments

Comments
 (0)