From 27e5f8eeb6410bca0c8aa9b2ff95337e8400fbb9 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 25 Jan 2021 15:19:56 +0100 Subject: [PATCH] Fixed capstone build issue on mac On mac, capstone's include path is `include/capstone` instead of just `include`... --- CMakeLists.txt | 2 -- include/helpers/disassembler.hpp | 4 ++++ include/views/view_disassembler.hpp | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2683eb83..7bc791408 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,6 @@ add_subdirectory(plugins/libimhex) # Add include directories include_directories(include ${CRYPTO_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}) -message(${CAPSTONE_INCLUDE_DIRS}) - detectOS() detectArch() diff --git a/include/helpers/disassembler.hpp b/include/helpers/disassembler.hpp index 0ff8b96bb..03f6a8bcd 100644 --- a/include/helpers/disassembler.hpp +++ b/include/helpers/disassembler.hpp @@ -1,6 +1,10 @@ #pragma once +#if __has_include() #include +#else +#include +#endif #include namespace hex { diff --git a/include/views/view_disassembler.hpp b/include/views/view_disassembler.hpp index 054082e63..8349e67c4 100644 --- a/include/views/view_disassembler.hpp +++ b/include/views/view_disassembler.hpp @@ -4,8 +4,6 @@ #include "helpers/disassembler.hpp" -#include - #include #include #include