From 1738c3f50a76aa082a313e9cc1461d07858a37c9 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Tue, 8 Feb 2022 19:22:52 +0100 Subject: [PATCH] build: Use correct include directory for capstone --- lib/libimhex/CMakeLists.txt | 2 +- lib/libimhex/include/hex/helpers/disassembler.hpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/libimhex/CMakeLists.txt b/lib/libimhex/CMakeLists.txt index 7149146b4..db43e3684 100644 --- a/lib/libimhex/CMakeLists.txt +++ b/lib/libimhex/CMakeLists.txt @@ -73,7 +73,7 @@ if (NOT USE_SYSTEM_CAPSTONE) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/capstone ${CMAKE_CURRENT_BINARY_DIR}/external/capstone EXCLUDE_FROM_ALL) set_target_properties(capstone-static PROPERTIES POSITION_INDEPENDENT_CODE ON) set(CAPSTONE_LIBRARIES "capstone-static") - set(CAPSTONE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../external/capstone/include/capstone) + set(CAPSTONE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../external/capstone/include) else() find_package(PkgConfig REQUIRED) pkg_search_module(CAPSTONE 4.0.2 REQUIRED capstone) diff --git a/lib/libimhex/include/hex/helpers/disassembler.hpp b/lib/libimhex/include/hex/helpers/disassembler.hpp index 28168f6fb..4e160f4a8 100644 --- a/lib/libimhex/include/hex/helpers/disassembler.hpp +++ b/lib/libimhex/include/hex/helpers/disassembler.hpp @@ -1,15 +1,13 @@ #pragma once -#if __has_include() - #include -#else - #include -#endif #include +#include + namespace hex { - enum class Architecture : i32 { + enum class Architecture : i32 + { ARM, ARM64, MIPS,