mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 23:37:49 +08:00
[antlr4,python3] Resolve cross port conflicts (#15378)
* [python3] Add vcpkg's include directories to the end rather than to the beginning. This is safe because vcpkg never hydrates python3's $(PySrcDir)\externals directory, so it wasn't using vendored dependencies at all. * [antlr4] Install antlr headers in antlr4-runtime rather than the root to avoid stomping on common name token.h. This is consistent with the ubuntu packages.
This commit is contained in:
parent
1e736c7eb4
commit
b12f78c3ed
ports
@ -1,5 +1,6 @@
|
||||
Source: antlr4
|
||||
Version: 4.8
|
||||
Port-Version: 1
|
||||
Homepage: https://www.antlr.org
|
||||
Description: ANother Tool for Language Recognition
|
||||
Build-Depends: libuuid (!uwp&!windows&!osx)
|
||||
|
@ -78,12 +78,6 @@ else()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
file(GLOB HDRS LIST_DIRECTORIES true ${CURRENT_PACKAGES_DIR}/include/antlr4-runtime/*)
|
||||
file(COPY ${HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/antlr4-runtime)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
message(STATUS "Installing done")
|
@ -6,7 +6,7 @@
|
||||
<PreprocessorDefinitions>_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="${VCPKG_LIBRARY_LINKAGE} == 'static'">XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>
|
||||
${CURRENT_INSTALLED_DIR}/include;%(AdditionalIncludeDirectories)
|
||||
%(AdditionalIncludeDirectories);${CURRENT_INSTALLED_DIR}/include
|
||||
</AdditionalIncludeDirectories>
|
||||
|
||||
<RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|Debug'">MultiThreadedDebug</RuntimeLibrary>
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "python3",
|
||||
"version-string": "3.9.0",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "The Python programming language",
|
||||
"homepage": "https://github.com/python/cpython",
|
||||
"supports": "!(arm | uwp)",
|
||||
|
Loading…
Reference in New Issue
Block a user