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

[github_actions] improve port compatibility #23202

Merged
merged 10 commits into from
Mar 15, 2022
Merged

[github_actions] improve port compatibility #23202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4aba4b3
use vcpkg provided libs before system frameworks on macOS, remove now…
cenit Feb 22, 2022
c3f21ff
fix references
cenit Feb 22, 2022
6330ed0
Merge branch 'master' into dev/cenit/github_actions
cenit Mar 3, 2022
e765053
fixes from review
cenit Mar 3, 2022
f50ed5f
apply fixes from review - remove warnings too!
cenit Mar 7, 2022
6fc01b7
Merge branch 'master' of github.com:microsoft/vcpkg into dev/cenit/gi…
vicroms Mar 8, 2022
7d25bda
Merge branch 'master' into dev/cenit/github_actions
cenit Mar 10, 2022
8eacbe6
[giflib] add license
cenit Mar 10, 2022
0ec9f49
fix references
cenit Mar 10, 2022
1084173
Merge branch 'master' of github.com:microsoft/vcpkg into dev/cenit/gi…
vicroms Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ports/giflib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,4 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_copy_pdbs()

file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/gif)

file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
3 changes: 0 additions & 3 deletions ports/giflib/vcpkg-cmake-wrapper.cmake
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ports/giflib/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "giflib",
"version": "5.2.1",
"port-version": 1,
"port-version": 2,
"description": "A library for reading and writing gif images.",
"homepage": "https://sourceforge.net/projects/giflib/",
"license": "MIT",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
5 changes: 5 additions & 0 deletions scripts/buildsystems/vcpkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,11 @@ z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_PREFIX_PATH "")
z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_LIBRARY_PATH "/lib/manual-link")
z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_FIND_ROOT_PATH "")

if(NOT VCPKG_PREFER_SYSTEM_LIBS)
set(CMAKE_FIND_FRAMEWORK "LAST") # we assume that frameworks are usually system-wide libs, not vcpkg-built
set(CMAKE_FIND_APPBUNDLE "LAST") # we assume that appbundles are usually system-wide libs, not vcpkg-built
endif()

# If one CMAKE_FIND_ROOT_PATH_MODE_* variables is set to ONLY, to make sure that ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
# and ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug are searched, it is not sufficient to just add them to CMAKE_FIND_ROOT_PATH,
# as CMAKE_FIND_ROOT_PATH specify "one or more directories to be prepended to all other search directories", so to make sure that
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2462,7 +2462,7 @@
},
"giflib": {
"baseline": "5.2.1",
"port-version": 1
"port-version": 2
},
"ginkgo": {
"baseline": "1.4.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/giflib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5b5833304ba0e1be5ff125f265d1f2e1098a93cb",
"version": "5.2.1",
"port-version": 2
},
{
"git-tree": "14178ec83d76a40e314adcf9bba75b63e99bc56d",
"version": "5.2.1",
Expand Down