From f62edea450ffd578b77d34fb56b349839a196d8e Mon Sep 17 00:00:00 2001 From: WerWolv Date: Fri, 26 Aug 2022 00:18:08 +0200 Subject: [PATCH] build: Fix various clang build issues --- cmake/build_helpers.cmake | 2 +- lib/external/pattern_language | 2 +- lib/libimhex/include/hex/data_processor/node.hpp | 2 +- plugins/builtin/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index e46ffa5e7..2dfa701c9 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -344,7 +344,7 @@ function(verifyCompiler) message(FATAL_ERROR "ImHex requires GCC 12.0.0 or newer. Please use the latest GCC version.") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14.0.0") message(FATAL_ERROR "ImHex requires Clang 14.0.0 or newer. Please use the latest Clang version.") - elseif (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + elseif (NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) message(FATAL_ERROR "ImHex can only be compiled with GCC or Clang. ${CMAKE_CXX_COMPILER_ID} is not supported.") endif() endfunction() diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 4ba360af6..42a6996cc 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 4ba360af6e39795e9f9ba48643c2e8437dec6f6a +Subproject commit 42a6996ccd1d5f8c9b37a4602aed4fa07c702965 diff --git a/lib/libimhex/include/hex/data_processor/node.hpp b/lib/libimhex/include/hex/data_processor/node.hpp index c5fcde804..1a5d9fdeb 100644 --- a/lib/libimhex/include/hex/data_processor/node.hpp +++ b/lib/libimhex/include/hex/data_processor/node.hpp @@ -90,7 +90,7 @@ namespace hex::dp { protected: [[noreturn]] void throwNodeError(const std::string &message) { - throw NodeError(this, message); + throw NodeError { this, message }; } std::vector getBufferOnInput(u32 index); diff --git a/plugins/builtin/CMakeLists.txt b/plugins/builtin/CMakeLists.txt index a0833c21c..f3d301aac 100644 --- a/plugins/builtin/CMakeLists.txt +++ b/plugins/builtin/CMakeLists.txt @@ -69,7 +69,7 @@ add_library(${PROJECT_NAME} SHARED target_include_directories(${PROJECT_NAME} PRIVATE include) # Add additional libraries here # -target_link_libraries(${PROJECT_NAME} PRIVATE libimhex LLVMDemangle) +target_link_libraries(${PROJECT_NAME} PRIVATE libimhex) # ---- No need to change anything from here downwards unless you know what you're doing ---- #