mirror of https://github.com/microsoft/vcpkg.git
[luminoengine] Avoid naming stdext::checked_array_iterator. (#51785)
This commit is contained in:
parent
fcbf1c740a
commit
4c6b7e989d
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/lumino/LuminoCore/include/LuminoCore/Base/detail/fmt/format.h b/lumino/LuminoCore/include/LuminoCore/Base/detail/fmt/format.h
|
||||||
|
index fa2d485..83decae 100644
|
||||||
|
--- a/lumino/LuminoCore/include/LuminoCore/Base/detail/fmt/format.h
|
||||||
|
+++ b/lumino/LuminoCore/include/LuminoCore/Base/detail/fmt/format.h
|
||||||
|
@@ -470,7 +470,7 @@ inline auto get_data(Container& c) -> typename Container::value_type* {
|
||||||
|
return c.data();
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if defined(_SECURE_SCL) && _SECURE_SCL
|
||||||
|
+#if defined(_SECURE_SCL) && _SECURE_SCL && (!defined(_MSC_VER) || _MSC_VER < 1951)
|
||||||
|
// Make a checked iterator to avoid MSVC warnings.
|
||||||
|
template <typename T> using checked_ptr = stdext::checked_array_iterator<T*>;
|
||||||
|
template <typename T>
|
||||||
|
|
@ -1,15 +1,14 @@
|
||||||
diff --git a/cmake/LuminoConfig.cmake.in b/cmake/LuminoConfig.cmake.in
|
diff --git a/cmake/LuminoConfig.cmake.in b/cmake/LuminoConfig.cmake.in
|
||||||
index 283ad47..aa9bfd8 100644
|
index 29dac4fde..71745973d 100644
|
||||||
--- a/cmake/LuminoConfig.cmake.in
|
--- a/cmake/LuminoConfig.cmake.in
|
||||||
+++ b/cmake/LuminoConfig.cmake.in
|
+++ b/cmake/LuminoConfig.cmake.in
|
||||||
@@ -13,5 +13,9 @@ include("${CMAKE_CURRENT_LIST_DIR}/LuminoTargets.cmake")
|
@@ -13,5 +13,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/LuminoTargets.cmake")
|
||||||
# Combination target
|
# Combination target
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
add_library(lumino::Lumino INTERFACE IMPORTED)
|
add_library(lumino::Lumino INTERFACE IMPORTED)
|
||||||
-target_link_libraries(lumino::Lumino INTERFACE lumino::LuminoEngine lumino::LuminoCore)
|
-target_link_libraries(lumino::Lumino INTERFACE lumino::LuminoEngine lumino::LuminoCore)
|
||||||
+if(LUMINO_BUILD_ENGINE)
|
-
|
||||||
+ target_link_libraries(lumino::Lumino INTERFACE lumino::LuminoEngine lumino::LuminoCore)
|
+target_link_libraries(lumino::Lumino INTERFACE lumino::LuminoCore)
|
||||||
+else()
|
+if(@LUMINO_BUILD_ENGINE@)
|
||||||
+ target_link_libraries(lumino::Lumino INTERFACE lumino::LuminoCore)
|
+ target_link_libraries(lumino::Lumino INTERFACE lumino::LuminoEngine)
|
||||||
+endif()
|
+endif()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,33 +1,32 @@
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO LuminoEngine/Lumino
|
REPO LuminoEngine/Lumino
|
||||||
REF "v${VERSION}"
|
REF "v${VERSION}"
|
||||||
SHA512 f43e48b36a48b5fcce4767de087f9953c905ac0af5522042a93c39ec75e4c9489b8910bc5b2f6fd129ce197309377a14b6eb9177a6ea9db4f5c2e7d1b13a137d
|
SHA512 f43e48b36a48b5fcce4767de087f9953c905ac0af5522042a93c39ec75e4c9489b8910bc5b2f6fd129ce197309377a14b6eb9177a6ea9db4f5c2e7d1b13a137d
|
||||||
HEAD_REF main
|
HEAD_REF main
|
||||||
PATCHES
|
PATCHES
|
||||||
fix-cmake-config.patch
|
avoid-stdext-checked-array-iterator.patch # https://github.com/LuminoEngine/Lumino/pull/222
|
||||||
)
|
fix-cmake-config.patch # https://github.com/LuminoEngine/Lumino/pull/223
|
||||||
|
)
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|
||||||
FEATURES
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
engine LUMINO_BUILD_ENGINE
|
FEATURES
|
||||||
)
|
engine LUMINO_BUILD_ENGINE
|
||||||
|
)
|
||||||
vcpkg_cmake_configure(
|
|
||||||
SOURCE_PATH "${SOURCE_PATH}"
|
vcpkg_cmake_configure(
|
||||||
OPTIONS
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
${FEATURE_OPTIONS}
|
OPTIONS
|
||||||
-DLUMINO_BUILD_EXAMPLES=OFF
|
${FEATURE_OPTIONS}
|
||||||
-DLN_BUILD_TESTS=OFF
|
-DLUMINO_BUILD_EXAMPLES=OFF
|
||||||
)
|
-DLN_BUILD_TESTS=OFF
|
||||||
|
)
|
||||||
vcpkg_cmake_install()
|
|
||||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/lumino)
|
vcpkg_cmake_install()
|
||||||
|
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/lumino)
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||||
vcpkg_copy_pdbs()
|
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||||
|
vcpkg_copy_pdbs()
|
||||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "luminoengine",
|
"name": "luminoengine",
|
||||||
"version": "0.10.1",
|
"version": "0.10.1",
|
||||||
"port-version": 1,
|
"port-version": 2,
|
||||||
"description": "C++17 games and visualization toolkit.",
|
"description": "C++17 games and visualization toolkit.",
|
||||||
"homepage": "https://github.com/LuminoEngine/Lumino",
|
"homepage": "https://github.com/LuminoEngine/Lumino",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|
|
||||||
|
|
@ -721,6 +721,7 @@ loguru:arm64-linux=fail
|
||||||
lua[tools]:arm64-linux=feature-fails
|
lua[tools]:arm64-linux=feature-fails
|
||||||
luajit:arm-neon-android=cascade # needs same pointer size for host
|
luajit:arm-neon-android=cascade # needs same pointer size for host
|
||||||
luasec:x64-windows-static=fail
|
luasec:x64-windows-static=fail
|
||||||
|
luminoengine[engine]=feature-fails # https://github.com/LuminoEngine/Lumino/issues/221
|
||||||
lunarg-vulkantools:arm64-linux=cascade
|
lunarg-vulkantools:arm64-linux=cascade
|
||||||
luv:arm64-windows=cascade
|
luv:arm64-windows=cascade
|
||||||
magma:arm64-linux=cascade
|
magma:arm64-linux=cascade
|
||||||
|
|
|
||||||
|
|
@ -6238,7 +6238,7 @@
|
||||||
},
|
},
|
||||||
"luminoengine": {
|
"luminoengine": {
|
||||||
"baseline": "0.10.1",
|
"baseline": "0.10.1",
|
||||||
"port-version": 1
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"lunarg-vulkantools": {
|
"lunarg-vulkantools": {
|
||||||
"baseline": "1.4.341.0",
|
"baseline": "1.4.341.0",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "3af7002c6bdae5d621bc6440bd8bbf610b4a6e77",
|
||||||
|
"version": "0.10.1",
|
||||||
|
"port-version": 2
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "f1c9d587cda9c08d9a07a874769567354c84b003",
|
"git-tree": "f1c9d587cda9c08d9a07a874769567354c84b003",
|
||||||
"version": "0.10.1",
|
"version": "0.10.1",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue