From 5092972843d8ed34dd98f7836e3d6297ef6c0eb7 Mon Sep 17 00:00:00 2001 From: Merry Date: Sat, 26 Feb 2022 13:34:59 +0000 Subject: [PATCH] CMakeLists: Use system vixl when able --- CMakeLists.txt | 7 +++++++ externals/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56b7f122..4a1e5dbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,6 +131,13 @@ if (DYNARMIC_NO_BUNDLED_ROBIN_MAP AND NOT TARGET tsl::robin_map) find_package(tsl-robin-map REQUIRED) endif() +if (DYNARMIC_NO_BUNDLED_VIXL AND ARCHITECTURE STREQUAL "arm64") + find_package(PkgConfig REQUIRED) + pkg_check_modules(vixl REQUIRED IMPORTED_TARGET vixl) + target_include_directories(PkgConfig::vixl INTERFACE "${vixl_INCLUDE_DIRS}/vixl") + add_library(vixl ALIAS PkgConfig::vixl) +endif() + if (DYNARMIC_NO_BUNDLED_XBYAK AND NOT TARGET xbyak) if (ARCHITECTURE STREQUAL "x86" OR ARCHITECTURE STREQUAL "x86_64") find_package(xbyak REQUIRED) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index a9fb4cc8..c9649515 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -32,7 +32,7 @@ endif() # vixl -if (ARCHITECTURE STREQUAL "arm64") +if (ARCHITECTURE STREQUAL "arm64" AND NOT TARGET vixl) add_subdirectory(vixl EXCLUDE_FROM_ALL) endif()