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

[angle] Fix regressions introduced in #4862: #5922

Merged
merged 1 commit into from
Apr 9, 2019

Conversation

ras0219-msft
Copy link
Contributor

Reintroduces the unofficial:: targets.

Use PREFER_NINJA.

Small simplifications/modernizations.

Reintroduces the unofficial:: targets.
PREFER_NINJA.
Small simplifications/modernizations.
@ras0219-msft ras0219-msft added the info:internal This PR or Issue was filed by the vcpkg team. label Apr 3, 2019
@ras0219-msft ras0219-msft self-assigned this Apr 3, 2019
@qis
Copy link
Contributor

qis commented Apr 3, 2019

Awesome! The unofficial::angle part works well, but I still have to link against X11::X11 and dl manually:

if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
  find_package(X11 REQUIRED)
  if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.14.0")
    target_link_libraries(${PROJECT_NAME} PUBLIC X11::X11 dl)
  else()
    target_include_directories(${PROJECT_NAME} PUBLIC ${X11_INCLUDE_DIR})
    target_link_libraries(${PROJECT_NAME} PUBLIC ${X11_LIBRARIES} dl)
  endif()
endif()

find_package(unofficial-angle CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PUBLIC unofficial::angle::libEGL unofficial::angle::libGLESv2)

Since it's an unofficial config, shouldn't we add it to the dependencies? I can send you a patch, but it won't have OSX support in it.

@Rastaban Rastaban merged commit ccbef64 into microsoft:master Apr 9, 2019
@ras0219-msft
Copy link
Contributor Author

@qis That'd be great! Incremental progress is still progress :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants