This is an archive of the discontinued LLVM Phabricator instance.

Differential D135650

Make windows resource generation more robust
ClosedPublic

Authored by powderluv on Oct 11 2022, 1:22 AM.

Details

Reviewers
stella.stamenova
stellaraccident
Commits
rG4d25ba0165aa: Make windows resource generation more robust
Summary

This is another attempt at https://reviews.llvm.org/D110489.

When build IREE we run into cases where we don't have / need
LLVM_VERSION_* etc set. Compilation fails if it isn't an integer.

Diff Detail

Event Timeline

powderluv created this revision.Oct 11 2022, 1:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 11 2022, 1:22 AM
powderluv requested review of this revision.Oct 11 2022, 1:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 11 2022, 1:22 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B191444: Diff 466726.Oct 11 2022, 2:42 AM
stellaraccident accepted this revision.Oct 11 2022, 6:27 AM
This revision is now accepted and ready to land.Oct 11 2022, 6:27 AM
Closed by commit rG4d25ba0165aa: Make windows resource generation more robust (authored by powderluv, committed by stellaraccident). · Explain WhyOct 11 2022, 6:31 AM
This revision was automatically updated to reflect the committed changes.
stellaraccident added a commit: rG4d25ba0165aa: Make windows resource generation more robust.
stellaraccident mentioned this in D110489: Make windows resource generation more robust to misconfiguration..Oct 11 2022, 6:32 AM

Revision Contents

PathSize
llvm/
cmake/
modules/
24 lines

Diff 466794

llvm/cmake/modules/AddLLVM.cmake

Show First 20 Lines • Show All 381 Lines • ▼ Show 20 Lines
function(set_windows_version_resource_properties name resource_file) function(set_windows_version_resource_properties name resource_file)
cmake_parse_arguments(ARG cmake_parse_arguments(ARG
"" ""
"VERSION_MAJOR;VERSION_MINOR;VERSION_PATCHLEVEL;VERSION_STRING;PRODUCT_NAME" "VERSION_MAJOR;VERSION_MINOR;VERSION_PATCHLEVEL;VERSION_STRING;PRODUCT_NAME"
"" ""
${ARGN}) ${ARGN})
if (NOT DEFINED ARG_VERSION_MAJOR) if (NOT DEFINED ARG_VERSION_MAJOR)
if (${LLVM_VERSION_MAJOR})
set(ARG_VERSION_MAJOR ${LLVM_VERSION_MAJOR}) set(ARG_VERSION_MAJOR ${LLVM_VERSION_MAJOR})
else()
set(ARG_VERSION_MAJOR 0)
endif()
endif() endif()
if (NOT DEFINED ARG_VERSION_MINOR) if (NOT DEFINED ARG_VERSION_MINOR)
if (${LLVM_VERSION_MINOR})
set(ARG_VERSION_MINOR ${LLVM_VERSION_MINOR}) set(ARG_VERSION_MINOR ${LLVM_VERSION_MINOR})
else()
set(ARG_VERSION_MINOR 0)
endif()
endif() endif()
if (NOT DEFINED ARG_VERSION_PATCHLEVEL) if (NOT DEFINED ARG_VERSION_PATCHLEVEL)
if (${LLVM_VERSION_PATCH})
set(ARG_VERSION_PATCHLEVEL ${LLVM_VERSION_PATCH}) set(ARG_VERSION_PATCHLEVEL ${LLVM_VERSION_PATCH})
else()
set(ARG_VERSION_PATCHLEVEL 0)
endif()
endif() endif()
if (NOT DEFINED ARG_VERSION_STRING) if (NOT DEFINED ARG_VERSION_STRING)
if (${PACKAGE_VERSION})
set(ARG_VERSION_STRING ${PACKAGE_VERSION}) set(ARG_VERSION_STRING ${PACKAGE_VERSION})
else()
set(ARG_VERSION_STRING 0)
endif()
endif() endif()
if (NOT DEFINED ARG_PRODUCT_NAME) if (NOT DEFINED ARG_PRODUCT_NAME)
set(ARG_PRODUCT_NAME "LLVM") set(ARG_PRODUCT_NAME "LLVM")
endif() endif()
set_property(SOURCE ${resource_file} set_property(SOURCE ${resource_file}
PROPERTY COMPILE_FLAGS /nologo) PROPERTY COMPILE_FLAGS /nologo)
▲ Show 20 Lines • Show All 1,969 Lines • Show Last 20 Lines