Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg|scripts] fix version check in vcpkg_find_acquire_program #21341

Merged
merged 1 commit into from
Nov 12, 2021

Conversation

Neumann-A
Copy link
Contributor

and force exact version match for meson (because it is meson and stuff breaks with other versions......)

@BillyONeal
Copy link
Member

Thank you so much... you have no idea how many hours you just saved this poor not-yet-cmake-native 😅

@BillyONeal
Copy link
Member

I confirmed that fontconfig is broken before and fixed now on an Ubuntu 20.04 box.

@JackBoosY JackBoosY added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Nov 12, 2021
@Be-ing
Copy link
Contributor

Be-ing commented Nov 12, 2021

Thanks for fixing this!

@JackBoosY
Copy link
Contributor

JackBoosY commented Nov 12, 2021

@wrobelda There is a kf5kio regression:

CMake Error at /agent/_work/1/s/scripts/buildsystems/vcpkg.cmake:540 (_add_executable):
  Target "kioexec" links to target "LibMount::LibMount" but the target was
  not found.  Perhaps a find_package() call is missing for an IMPORTED
  target, or an ALIAS target is missing?
Call Stack (most recent call first):
  src/kioexec/CMakeLists.txt:28 (add_executable)


CMake Error at /agent/_work/1/s/scripts/buildsystems/vcpkg.cmake:578 (_add_library):
  Target "kio_trash" links to target "LibMount::LibMount" but the target was
  not found.  Perhaps a find_package() call is missing for an IMPORTED
  target, or an ALIAS target is missing?
Call Stack (most recent call first):
  src/ioslaves/trash/CMakeLists.txt:30 (add_library)
...

I didn't find any find libmount code in kf5kio source, can you please take a look?

Edit:

usr@usr:/home/vzay/work/20439/vcpkg# find installed/x64-linux/share/ -name *.cmake | xargs grep LibMount
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:FindLibMount
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:``LibMount_FOUND``
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    LibMount was found on the system.
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:``LibMount_INCLUDE_DIRS``
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:``LibMount_LIBRARIES``
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:``LibMount_VERSION``
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:If ``LibMount_FOUND`` is TRUE, it will also define the following imported target:
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:``LibMount::LibMount``
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:find_path(LibMount_INCLUDE_DIRS NAMES libmount/libmount.h HINTS ${PC_LIBMOUNT_INCLUDE_DIRS})
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:find_library(LibMount_LIBRARIES NAMES mount HINTS ${PC_LIBMOUNT_LIBRARY_DIRS})
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:set(LibMount_VERSION ${PC_LIBMOUNT_VERSION})
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:if(LibMount_INCLUDE_DIRS AND NOT LibMount_VERSION)
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    file(READ "${LibMount_INCLUDE_DIRS}/libmount/libmount.h" _LibMount_header_contents)
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    string(REGEX MATCHALL "#define[ \t]+LIBMOUNT_VERSION[ \t]+\"*[0-9.]+" _LibMount_version_line "${_LibMount_header_contents}")
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    unset(_LibMount_header_contents)
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    string(REGEX REPLACE ".*LIBMOUNT_VERSION[ \t]+\"*([0-9.]+)\"*" "\\1" _version "${_LibMount_version_line}")
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    set(LibMount_VERSION "${_version}")
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    unset(_LibMount_version_line)
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:find_package_handle_standard_args(LibMount
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    FOUND_VAR LibMount_FOUND
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    REQUIRED_VARS LibMount_INCLUDE_DIRS LibMount_LIBRARIES
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    VERSION_VAR LibMount_VERSION
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:mark_as_advanced(LibMount_INCLUDE_DIRS LibMount_LIBRARIES)
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:if(LibMount_FOUND AND NOT TARGET LibMount::LibMount)
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    add_library(LibMount::LibMount UNKNOWN IMPORTED)
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:    set_target_properties(LibMount::LibMount PROPERTIES
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:        IMPORTED_LOCATION "${LibMount_LIBRARIES}"
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:        INTERFACE_INCLUDE_DIRECTORIES "${LibMount_INCLUDE_DIRS}"
installed/x64-linux/share/ECM/find-modules/FindLibMount.cmake:set_package_properties(LibMount PROPERTIES
installed/x64-linux/share/KF5Solid/KF5SolidTargets.cmake:  INTERFACE_LINK_LIBRARIES "Qt5::Core;\$<LINK_ONLY:Qt5::Xml>;\$<LINK_ONLY:Qt5::Gui>;\$<LINK_ONLY:UDev::UDev>;\$<LINK_ONLY:LibMount::LibMount>;\$<LINK_ONLY:Qt5::DBus>"

Introduced by kf5solid.

Depends on #21344.

@Neumann-A
Copy link
Contributor Author

@BillyONeal I assume you will merge this although CI is not completely green due to regression discovered by the world rebuild

@Be-ing Be-ing mentioned this pull request Nov 12, 2021
@BillyONeal BillyONeal merged commit 356918c into microsoft:master Nov 12, 2021
@BillyONeal
Copy link
Member

@BillyONeal I assume you will merge this although CI is not completely green due to regression discovered by the world rebuild

picks up admin hammer

ping

puts down admin hammer

Thanks for the fix!

@Neumann-A Neumann-A deleted the fix_version_check branch November 12, 2021 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants