зеркало из https://github.com/microsoft/vcpkg.git
[Dlib] Enable arm64-windows (#26778)
* Add arm64-windows support * Update port version * Update dlib version * Add dlib:arm64-windows in ci.baseline Co-authored-by: Nursultan Zarlyk <nzarlyk@microsoft.com>
This commit is contained in:
Родитель
46798970f0
Коммит
e19fc496c7
|
@ -20,10 +20,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||
"cuda" DLIB_USE_CUDA
|
||||
)
|
||||
|
||||
if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
set(COMMON_OPTIONS -DUSE_SSE2_INSTRUCTIONS=OFF)
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
${COMMON_OPTIONS}
|
||||
-DDLIB_PNG_SUPPORT=ON
|
||||
-DCMAKE_REQUIRE_FIND_PACKAGE_PNG=ON
|
||||
-DDLIB_JPEG_SUPPORT=ON
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "dlib",
|
||||
"version": "19.24",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++",
|
||||
"homepage": "https://github.com/davisking/dlib",
|
||||
"license": "BSL-1.0",
|
||||
|
|
|
@ -200,7 +200,6 @@ discord-rpc:x64-uwp=fail
|
|||
# requires g++11
|
||||
discordcoreapi:x64-linux=fail
|
||||
dlib:arm-uwp=fail
|
||||
dlib:arm64-windows=fail
|
||||
dlib:x64-uwp=fail
|
||||
dmlc:arm-uwp=fail
|
||||
dmlc:x64-uwp=fail
|
||||
|
|
|
@ -1970,7 +1970,7 @@
|
|||
},
|
||||
"dlib": {
|
||||
"baseline": "19.24",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"dmlc": {
|
||||
"baseline": "2019-08-12",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9eaa35254408c210c84c3bfebb8e8651bab075e0",
|
||||
"version": "19.24",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "975dbde01f120a124488aae7930005b4b0409e58",
|
||||
"version": "19.24",
|
||||
|
|
Загрузка…
Ссылка в новой задаче