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.

Sign up for GitHub

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

Jump to bottom

[libwebsockets] Fix build error on Linux #6855

Merged
merged 1 commit into from
Jun 17, 2019
Merged

[libwebsockets] Fix build error on Linux #6855

merged 1 commit into from
Jun 17, 2019

Conversation

LilyWangL
Copy link
Contributor

@LilyWangL LilyWangL commented Jun 11, 2019 •
edited
Loading

  1. Remove the old patch, because the file were not found in the source.
  2. Fix build error:
CMake Error at scripts/cmake/vcpkg_fixup_cmake_targets.cmake:45 (message):
  '/c/Users/rkito/src/vcpkg/packages/libwebsockets_x64-linux/debug/cmake'
  does not exist.
Call Stack (most recent call first):
  ports/libwebsockets/portfile.cmake:31 (vcpkg_fixup_cmake_targets)
  scripts/ports.cmake:71 (include)

Related issue: #6849

@LilyWangL LilyWangL added the info:internal This PR or Issue was filed by the vcpkg team. label Jun 11, 2019
@Neumann-A
Copy link
Contributor

vcpkg_fixup_cmake_targets

should probably try to autodetect the correct paths. I have seen enough of those "linux fixes" in every portfile.....

@LilyWangL
Copy link
Contributor Author

/azp run

ras0219-msft
ras0219-msft reviewed Jun 13, 2019
View reviewed changes
ports/libwebsockets/portfile.cmake
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/lib/websockets.lib)
if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/lib/websockets.lib)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will (probably) break the generated cmake targets.

What happens if we don't perform this rename?

@Rastaban Rastaban merged commit b4ae1fb into microsoft:master Jun 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ras0219-msft ras0219-msft ras0219-msft left review comments

Assignees

@Rastaban Rastaban

Labels
info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@LilyWangL @Neumann-A @ras0219-msft @Rastaban