From 9d369436d8834e8ebed5b418b14cebb70885cefa Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Tue, 22 Mar 2022 00:44:38 +0100 Subject: [PATCH] cmake: Fix unicorn and llvm --- CMakeLists.txt | 2 +- src/dynarmic/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71352c42..b5fd5f1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,7 +160,7 @@ if (DYNARMIC_USE_LLVM) llvm_map_components_to_libnames(llvm_libs armdesc armdisassembler aarch64desc aarch64disassembler x86desc x86disassembler) endif() -if (DYNARMIC_TESTS_USE_UNICORN) +if (DYNARMIC_TESTS_USE_UNICORN AND DYNARMIC_TESTS) find_package(Unicorn REQUIRED) endif() diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt index c6c9060f..f40a60f9 100644 --- a/src/dynarmic/CMakeLists.txt +++ b/src/dynarmic/CMakeLists.txt @@ -390,7 +390,7 @@ target_link_libraries(dynarmic tsl::robin_map $ $ - $<$:${llvm_libs}> + "$<$:${llvm_libs}>" ) if (DYNARMIC_ENABLE_CPU_FEATURE_DETECTION) target_compile_definitions(dynarmic PRIVATE DYNARMIC_ENABLE_CPU_FEATURE_DETECTION=1)