[vcpkg][folly] Fix post lint checks for folly.

This commit is contained in:
Robert Schumacher 2017-05-08 20:52:53 -07:00
parent 92591846cc
commit 9223a08134
2 changed files with 9 additions and 0 deletions

View File

@ -34,6 +34,10 @@ vcpkg_configure_cmake(
-DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME}
)
# Folly runs built executables during the build, so they need access to the installed DLLs.
# TODO: Confirm it's ok that we aren't adding the debug/bin folder.
set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin")
vcpkg_install_cmake()
vcpkg_copy_pdbs()

View File

@ -427,6 +427,11 @@ namespace vcpkg::PostBuildLint
"The file extension was not .lib: %s",
file.generic_string());
COFFFileReader::LibInfo info = COFFFileReader::read_lib(file);
// This is zero for folly's debug library
// TODO: Why?
if (info.machine_types.size() == 0) return LintStatus::SUCCESS;
Checks::check_exit(VCPKG_LINE_INFO,
info.machine_types.size() == 1,
"Found more than 1 architecture in file %s",