diff options
| author | Kyle Benesch <4b796c65+github@gmail.com> | 2021-05-06 17:42:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 17:42:04 -0700 |
| commit | 7c23c13db0b0c26ffb436cd85af812152865e59b (patch) | |
| tree | 6054e11d8aa71f9cc16887d1f9edffd246eaa4d1 | |
| parent | 09ff6245de56c192b5f196cd07b9bf4f036bffd3 (diff) | |
| download | vcpkg-7c23c13db0b0c26ffb436cd85af812152865e59b.tar.gz vcpkg-7c23c13db0b0c26ffb436cd85af812152865e59b.zip | |
[libtcod] Update to 1.16.7 (#17032)
* [libtcod] Update to 1.16.7
* [libtcod] Change to using version-semver in manifest.
* Apply suggestions from code review
* fixup! Apply suggestions from code review
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
| -rw-r--r-- | ports/libtcod/portfile.cmake | 18 | ||||
| -rw-r--r-- | ports/libtcod/vcpkg.json | 11 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/l-/libtcod.json | 15 |
4 files changed, 33 insertions, 15 deletions
diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index fad5c0df8..235f26af7 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,18 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.16.6 - SHA512 88777acd89d5ab2541d8b5d2f6db966059b76501b591d6e1d782d0d39b0adbcb38be25c49716b6e581b4b0488bf2dbfc5b07452b80495365861cee97e5279bfd + REF 2311b47028f0879c1d3fc44e11d8352052b8d8b0 + SHA512 7b3ab6daf6847d2d0993a1aa73d6d4b9b56684ac5f44cdf7d4ae551600c5354c72afdfa40abd837dda66b3bb1e4c0d50c8c9a7bf5a7e4915cbdc703211c7c917 HEAD_REF develop ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include - -DCMAKE_INSTALL_CONFIGDIR=share/libtcod -DLIBTCOD_SDL2=find_package -DLIBTCOD_ZLIB=find_package -DLIBTCOD_GLAD=find_package @@ -21,14 +19,10 @@ vcpkg_configure_cmake( -DLIBTCOD_STB=vcpkg ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file( - INSTALL "${SOURCE_PATH}/LICENSE.txt" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index 4b28151a8..2201f1694 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libtcod", - "version-string": "1.16.6", + "version-semver": "1.16.7", + "port-version": 2, "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", @@ -11,6 +12,14 @@ "sdl2", "stb", "utf8proc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 420d19a44..d81e9315f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3549,8 +3549,8 @@ "port-version": 1 }, "libtcod": { - "baseline": "1.16.6", - "port-version": 0 + "baseline": "1.16.7", + "port-version": 2 }, "libtheora": { "baseline": "1.2.0alpha1-20170719", diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index 6f09bea3b..227d9442b 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,6 +1,21 @@ { "versions": [ { + "git-tree": "1d7bdb2a149f1fa7d4daa37fd02e9655273f503f", + "version-semver": "1.16.7", + "port-version": 2 + }, + { + "git-tree": "40587cd0b117a21791c1da332c89c6e1a820e2a9", + "version-semver": "1.16.7", + "port-version": 1 + }, + { + "git-tree": "c8498087d7b87609436a7c5fb85c391592add740", + "version-string": "1.16.7", + "port-version": 0 + }, + { "git-tree": "e2de0a47f3776252b6e04681c92d67b0730587ef", "version-string": "1.16.6", "port-version": 0 |