-
Notifications
You must be signed in to change notification settings - Fork 6.2k
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-cmake-config] Fix fixup of )
paths
#38921
Conversation
|
Actually this PR deals only with completely broken results due to
category:port-bug
|
)
paths
This PR changes CMake config, typically fixing the |
@dg0yt Please try to merge the latest dev. |
Pointless. Vcpkg CI build merges with
@talregev I don't need a proxy in my vcpkg contacts. FTR it is not the build step which is stuck but the cmake config fixup which follows. Which is the code changed by my PR. |
In my opinion the ci stuck not from your code change. And we already have a ci problems so I am asking to check that. |
Regular expression woes. Escaped double quotes inside quotes in set(contents [[
# Generated CMake target import file.
add_library(unofficial::angle::libANGLE STATIC IMPORTED)
set_target_properties(unofficial::angle::libANGLE PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "ANGLE_ENABLE_ESSL;ANGLE_ENABLE_GLSL;ANGLE_CAPTURE_ENABLED=0;GL_APICALL=;GL_API=;NOMINMAX;ANGLE_ENABLE_D3D11;ANGLE_ENABLE_HLSL;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" };ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW;ANGLE_ENABLE_GLSL;ANGLE_ENABLE_OPENGL;ANGLE_ENABLE_GL_DESKTOP_BACKEND;KHRONOS_STATIC"
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ZLIB::ZLIB>"
)
]])
while(contents MATCHES "set_target_properties[(]([^ \$]*) PROPERTIES([^\")]+| \"[^\"]*\")+[)]")
message(STATUS "FOUND set_target_properties")
endwhile()
message(STATUS "${contents}") The function is already only touching files which can be assumed to be generated by CMake. Maybe we should simply use this to more closely match on an |
2e5b3d6
to
92ec7af
Compare
2f0a27a
to
b134218
Compare
@FrankXie05 can you take a look? |
Cherry-picked from #38847:
Fix processing of
INTERFACE_LINK_LIBS
when it contain)
inside"
, e.g. forC:/Program Files (x86)/Windows Kits/10/Lib/10.0.22621.0/um/x64/User32.Lib
created by
pkg_check_modules
from-luser32
as found in icu pc files.Without the fix, the property is not processed at all, pulling release libs into debug builds.