Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Fix various clang build issues

This commit is contained in:
WerWolv 2022-08-26 00:18:08 +02:00
parent 940f1e30c5
commit f62edea450
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/build_helpers.cmake
View File

@ -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()

2
lib/external/pattern_language vendored

@ -1 +1 @@
Subproject commit 4ba360af6e39795e9f9ba48643c2e8437dec6f6a
Subproject commit 42a6996ccd1d5f8c9b37a4602aed4fa07c702965

2
lib/libimhex/include/hex/data_processor/node.hpp
View File

@ -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<u8> getBufferOnInput(u32 index);

2
plugins/builtin/CMakeLists.txt
View File

@ -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 ---- #