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

Fix exported osx framework config #2

Merged
merged 9 commits into from
May 31, 2021
Merged

Fix exported osx framework config #2

merged 9 commits into from
May 31, 2021

Conversation

dg0yt
Copy link

@dg0yt dg0yt commented May 16, 2021

For microsoft#16706.

Using CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES, curl's CURLTarget.cmake changes as follows:

<   INTERFACE_LINK_LIBRARIES "lber;ldap;/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk/System/Library/Frameworks/CoreFoundation.framework;/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk/System/Library/Frameworks/Security.framework;ZLIB::ZLIB"
---
>   INTERFACE_LINK_LIBRARIES "lber;ldap;-framework CoreFoundation;-framework Security;ZLIB::ZLIB"

This PR uses CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES, other than in microsoft#17790 (frameworks in curl pc files) where I used CMAKE_SYSTEM_FRAMEWORK_PATH. On my MBA, the values are as follows:

-- CMAKE_SYSTEM_FRAMEWORK_PATH: ~/Library/Frameworks;/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk/Library/Frameworks;/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk/Network/Library/Frameworks;/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk/System/Library/Frameworks;/Library/Developer/CommandLineTools/Library/Frameworks;/Library/Developer/CommandLineTools/Library/Frameworks;/Library/Frameworks;/Network/Library/Frameworks;/System/Library/Frameworks
-- CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES: /Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk/System/Library/Frameworks
-- CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES: /Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk/System/Library/Frameworks

In the end, it might make sense to use the same variable, and possibly move the changes from 17790 to vcpkg_fixup_pkgconfig.

@dg0yt dg0yt mentioned this pull request May 16, 2021
Merged
@JackBoosY
Copy link
Owner

Thanks! I will take a look!

@dg0yt dg0yt marked this pull request as draft May 19, 2021 07:08
@dg0yt dg0yt marked this pull request as ready for review May 19, 2021 08:36
JackBoosY added a commit that referenced this pull request May 25, 2021
@jwtowner @JackBoosY
[woff2] fix for static linking and alternative compiler toolchains (m…
9d80704 
…icrosoft#16392)

* [woff2] fix static linking and alternate toolchain

First, this change teaches the woff2 CMake configuration to
understand the vcpkg's custom unofficial-brotli pkg-config
configuration in order to support static linking. This fixes a
build failure on x64-linux or other triplets when
VCPKG_LIBRARY_LINKAGE is set to static.

Secondly, the CANONICAL_PREFIXES option for the woff2 CMake
configuration has been changed to be on by default, otherwise
custom triplets or toolchains using alternate compilers such as
Clang/LLVM or other versions of GCC will fail.
Leaving CANONICAL_PREFIXES set to OFF causes
-no-canonical-prefixes to be passed to the compiler, which
prevents symlinked compiler toolchains from working correctly.
If a user does actually need non-canonical prefixes, chances are
they will have a custom triplet or toolchain file that passes in
-no-canonical-prefixes as a CFLAG for every port, and so setting
it to ON here is a better default for vcpkg.

* [woff2] update versions

* [woff2] update control file

* [woff2] update versions

* [woff2] update ci.baseline.txt

* Update ports/woff2/0001-unofficial-brotli.patch

Co-authored-by: Jack·Boos·Yu <[email protected]>

* [woff2] regenerate 0001-unofficial-brotli.patch file

* [woff2] update versions

* [woff2] regenerate 0001-unofficial-brotli.patch file attempt #2

* [woff2] update versions

Co-authored-by: Jack·Boos·Yu <[email protected]>
@JackBoosY
Copy link
Owner

Thanks!

@JackBoosY JackBoosY merged commit 96c2367 into JackBoosY:dev/jack/16259 May 31, 2021
JackBoosY added a commit that referenced this pull request Jan 4, 2022
@winsoft666 @JonLiu1993 @JackBoosY
[teemo] Fix string replace error. (microsoft#22244)
4446d54 
* [cpp-ipc] Update 1.0.1

* [cpp-ipc] Update version and ci.baseline

* [cpp-ipc] Remove cpp-ipc from ci.baseline.txt

* [teemo] Update to v2.3

* [teemo] Run `vcpkg x-add-version --all`

* [teemo] Update vcpkg.json

* [teemo] Run vcpkg `x-add-version teemo --overwrite-version`

* Remove excess teemo.json

* [teemo] Update to v2.4

* [teemo] run ./vcpkg x-add-version --all

* [teemo] Update to v2.5

* [teemo] Update versions/t-/teemo.json

* [teemo] Fix string replace error.

* [teemo] Update port version.

* [teemo] Use port-version instead of appending #2.

* [teemo] Run 'vcpkg x-add-version --all'

* [teemo] Add maintainers.

* Update versions/t-/teemo.json

* Update versions/t-/teemo.json

* Update ports/teemo/vcpkg.json

* [teemo] Format vcpkg.json

Co-authored-by: Jonliu1993 <[email protected]>
Co-authored-by: Jack·Boos·Yu <[email protected]>
JackBoosY pushed a commit that referenced this pull request Aug 5, 2022
@cenit @FrankXie05 @Thieum
[OpenCV] update to v4.6.0 (microsoft#25431)
acb370d 
* [OpenCV] update to v3.4.18 and v4.6.0
enable python2 in vcpkg-get-python-package

* fix references

* remove python2 from testing

* restore python2 tests only on windows&x64

* fix references

* [OpenCV2] add jasper patch

* fix references

* update handling multiple versions

* add usage files

* [dbow] fix build

* [dbow] fix version

* fix references

* remove ipp from vcpkg-ci-opencv for opencv3

* [OpenCV2] fix CRT linking with static libs

* fix references

* [dbow3] add support clause now that is CI tested
[cctag] enable opencv4, fix build on osx

* fix references

* [OpenCV2] fix patch

* fix references

* [libharu] bump version

* fix references

* [rtabmap] fix for opencv 4.6

* [rtabmap] fix manifest

* fix references

* remove llvm dependency to ease CI load

* version

* overwrite version

* fixes for mingw

* add mingw patch

* fix references

* [OpenCV2] fix generated config on win32

* fix references

* update version

* update version

* overwrite baseline

* cleanup after merge

* fix references

* [openmvs] trying to diagnose the problem - DO NOT MERGE

* fix references

* restore port version

* fix references

* Revert "[openmvs] trying to diagnose the problem - DO NOT MERGE"

This reverts commit 8bfd0ff.

* Revert "fix references"

This reverts commit 0e915f6.

* skip opencv2 and opencv3

* remove again opencv2/3 from vcpkg-ci-opencv

* apply fixes from review

* fix references

* wrong checksum (tested on windows)

* Github-actions fixes (#2)

* Update opencv4.json

* fix github-actions issues

* formating vcpkg.json

* update git-trees

* fix rtabmap license

* fix references

* fix also dbow3 license

* fix references

* [cctag] remove unnecessary patch section

* fix references

Co-authored-by: Frank <[email protected]>
Co-authored-by: FrankXie <[email protected]>
Co-authored-by: Matthieu Penant <[email protected]>
Co-authored-by: Matthieu Penant <[email protected]>
JackBoosY pushed a commit that referenced this pull request Aug 8, 2023
@rdhafidh
[gperf] Fix error in cpp17 mode (microsoft#32980)
56a44f3 
* fix gperf in cpp17 mode

* update version

* update version #2

* remove unused header patch file

* update version 3

---------

Co-authored-by: rdh <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JackBoosY JackBoosY JackBoosY left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dg0yt @JackBoosY