@@ -20,20 +20,28 @@ list(APPEND options
2020 -Dtest=disabled
2121)
2222
23+ if (NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_IS_LINUX)
24+ list (APPEND options -Drequire-system-font-provider=false )
25+ endif ()
26+
27+ set (asm_option disabled)
2328set (additional_binaries "" )
2429if ("asm" IN_LIST FEATURES)
25- list (APPEND options -Dasm=enabled)
26- if (VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|x64)$" )
27- vcpkg_find_acquire_program (NASM )
28- get_filename_component (NASM_EXE_PATH "${NASM} " DIRECTORY )
29- vcpkg_add_to_path ("${NASM_EXE_PATH} " )
30- elseif (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" )
31- vcpkg_find_acquire_program (CLANG )
32- list (APPEND additional_binaries "clang = ['${CLANG} ']" )
30+ if (VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|x64|arm64)$" )
31+ set (asm_option enabled)
32+ if (VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|x64)$" )
33+ vcpkg_find_acquire_program (NASM )
34+ get_filename_component (NASM_EXE_PATH "${NASM} " DIRECTORY )
35+ vcpkg_add_to_path ("${NASM_EXE_PATH} " )
36+ elseif (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" )
37+ vcpkg_find_acquire_program (CLANG )
38+ list (APPEND additional_binaries "clang = ['${CLANG} ']" )
39+ endif ()
40+ else ()
41+ message (WARNING "Feature 'asm' is not supported on ${VCPKG_TARGET_ARCHITECTURE} ; disabling assembly optimizations." )
3342 endif ()
34- else ()
35- list (APPEND options -Dasm=disabled)
3643endif ()
44+ list (APPEND options -Dasm=${asm_option} )
3745
3846vcpkg_configure_meson (
3947 SOURCE_PATH "${SOURCE_PATH} "
0 commit comments