diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake index bf9a3b2624be02..8a58b690a18fce 100644 --- a/ports/giflib/portfile.cmake +++ b/ports/giflib/portfile.cmake @@ -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) diff --git a/ports/giflib/vcpkg-cmake-wrapper.cmake b/ports/giflib/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index f688cff964e8b7..00000000000000 --- a/ports/giflib/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,3 +0,0 @@ -find_path(GIF_INCLUDE_DIR gif_lib.h PATH_SUFFIXES include PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - -_find_package(${ARGS}) diff --git a/ports/giflib/vcpkg.json b/ports/giflib/vcpkg.json index 6cbbf622ceec59..2e950baed3d9bd 100644 --- a/ports/giflib/vcpkg.json +++ b/ports/giflib/vcpkg.json @@ -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", diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index ceac24ffd84212..2bee6cbe86095e 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -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 diff --git a/versions/baseline.json b/versions/baseline.json index bd4a6a7b1414d8..112d986015c6ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2462,7 +2462,7 @@ }, "giflib": { "baseline": "5.2.1", - "port-version": 1 + "port-version": 2 }, "ginkgo": { "baseline": "1.4.0", diff --git a/versions/g-/giflib.json b/versions/g-/giflib.json index 834cde1ea7640c..e9456f42e36ac8 100644 --- a/versions/g-/giflib.json +++ b/versions/g-/giflib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b5833304ba0e1be5ff125f265d1f2e1098a93cb", + "version": "5.2.1", + "port-version": 2 + }, { "git-tree": "14178ec83d76a40e314adcf9bba75b63e99bc56d", "version": "5.2.1",