From a3132b7d13c34b062d0b703697e636b13b856676 Mon Sep 17 00:00:00 2001 From: WerWolv <werwolv98@gmail.com> Date: Tue, 9 Aug 2022 14:59:58 +0200 Subject: [PATCH] build: Fixed system llvm linking errors --- lib/external/llvm-demangle/CMakeLists.txt | 6 +++--- lib/libimhex/CMakeLists.txt | 4 ++-- plugins/builtin/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/external/llvm-demangle/CMakeLists.txt b/lib/external/llvm-demangle/CMakeLists.txt index 56760c24e..926b44e2a 100644 --- a/lib/external/llvm-demangle/CMakeLists.txt +++ b/lib/external/llvm-demangle/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.16) -project(llvm-demangle) +project(LLVMDemangle) set(CMAKE_CXX_STANDARD 17) -add_library(llvm-demangle STATIC +add_library(LLVMDemangle STATIC source/Demangle.cpp source/DLangDemangle.cpp source/ItaniumDemangle.cpp @@ -12,4 +12,4 @@ add_library(llvm-demangle STATIC source/RustDemangle.cpp ) -target_include_directories(llvm-demangle PUBLIC include) +target_include_directories(LLVMDemangle PUBLIC include) diff --git a/lib/libimhex/CMakeLists.txt b/lib/libimhex/CMakeLists.txt index 988cb3141..c78d3e2f2 100644 --- a/lib/libimhex/CMakeLists.txt +++ b/lib/libimhex/CMakeLists.txt @@ -54,7 +54,7 @@ endif() if (NOT USE_SYSTEM_LLVM) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/llvm-demangle ${CMAKE_CURRENT_BINARY_DIR}/external/llvm-demangle EXCLUDE_FROM_ALL) - set_target_properties(llvm-demangle PROPERTIES POSITION_INDEPENDENT_CODE ON) + set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON) else() find_package(LLVM REQUIRED Demangle) endif() @@ -163,4 +163,4 @@ if (APPLE) target_link_libraries(libimhex PUBLIC ${FOUNDATION}) endif () -target_link_libraries(libimhex PUBLIC dl imgui nfd magic ${CAPSTONE_LIBRARIES} llvm-demangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${LIBCURL_LIBRARIES} ${MBEDTLS_LIBRARIES} ${FMT_LIBRARIES} ${Python_LIBRARIES} libromfs libpl) +target_link_libraries(libimhex PUBLIC dl imgui nfd magic ${CAPSTONE_LIBRARIES} LLVMDemangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${LIBCURL_LIBRARIES} ${MBEDTLS_LIBRARIES} ${FMT_LIBRARIES} ${Python_LIBRARIES} libromfs libpl) diff --git a/plugins/builtin/CMakeLists.txt b/plugins/builtin/CMakeLists.txt index 97cebaf76..35ce7d5f9 100644 --- a/plugins/builtin/CMakeLists.txt +++ b/plugins/builtin/CMakeLists.txt @@ -67,7 +67,7 @@ add_library(${PROJECT_NAME} SHARED target_include_directories(${PROJECT_NAME} PRIVATE include) # Add additional libraries here # -target_link_libraries(${PROJECT_NAME} PRIVATE libimhex llvm-demangle) +target_link_libraries(${PROJECT_NAME} PRIVATE libimhex LLVMDemangle) # ---- No need to change anything from here downwards unless you know what you're doing ---- #