Skip to content

Commit f805421

Browse files
committed
vcpkg: Update baseline and local overlay portfile
1 parent 65c961a commit f805421

2 files changed

Lines changed: 13 additions & 16 deletions

File tree

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version-string": "1.4.0",
55
"description": "A basic transport layer for games.",
66
"homepage": "https://github.com/ValveSoftware/GameNetworkingSockets",
7-
"builtin-baseline": "c3867e714dd3a51c272826eea77267876517ed99",
7+
"builtin-baseline": "522253caf47268c1724f486a035e927a42a90092",
88
"dependencies": [ "protobuf", "openssl" ],
99
"default-features": [ "openssl" ],
1010
"features": {

vcpkg_ports/gamenetworkingsockets/portfile.cmake

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,22 @@ if (BUILD_TESTS OR BUILD_TOOLS)
4343
set(BUILD_STATIC_LIB true)
4444
endif()
4545

46-
vcpkg_configure_cmake(
47-
SOURCE_PATH ${SOURCE_PATH}
48-
PREFER_NINJA
46+
vcpkg_cmake_configure(
47+
SOURCE_PATH "${SOURCE_PATH}"
4948
OPTIONS
50-
-DUSE_CRYPTO=${CRYPTO_BACKEND}
51-
-DBUILD_STATIC_LIB=${BUILD_STATIC_LIB}
52-
-DBUILD_SHARED_LIB=${BUILD_SHARED_LIB}
53-
-DMSVC_CRT_STATIC=${MSVC_CRT_STATIC}
54-
${FEATURE_OPTIONS}
49+
-DUSE_CRYPTO=${CRYPTO_BACKEND}
50+
-DBUILD_STATIC_LIB=${BUILD_STATIC_LIB}
51+
-DBUILD_SHARED_LIB=${BUILD_SHARED_LIB}
52+
-DMSVC_CRT_STATIC=${MSVC_CRT_STATIC}
53+
${FEATURE_OPTIONS}
5554
)
5655

5756
vcpkg_cmake_install()
57+
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/GameNetworkingSockets")
58+
vcpkg_fixup_pkgconfig()
5859

59-
# Copy some files
60-
61-
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
62-
vcpkg_copy_pdbs()
63-
64-
# Cleanup some file droppings that our cmakefile really should
65-
# not be publishing
6660
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
6761
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
62+
63+
vcpkg_copy_pdbs()
64+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

0 commit comments

Comments
 (0)