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

build: Move jthread library to libwolv

This commit is contained in:
WerWolv 2025-09-24 20:48:50 +02:00
parent 265360229f
commit 1b6a150624
6 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -18,10 +18,6 @@
path = lib/third_party/capstone path = lib/third_party/capstone
url = https://github.com/capstone-engine/capstone url = https://github.com/capstone-engine/capstone
ignore = dirty ignore = dirty
[submodule "lib/third_party/jthread/jthread"]
path = lib/third_party/jthread/jthread
url = https://github.com/josuttis/jthread
ignore = dirty
[submodule "lib/third_party/edlib"] [submodule "lib/third_party/edlib"]
path = lib/third_party/edlib path = lib/third_party/edlib
url = https://github.com/Martinsos/edlib url = https://github.com/Martinsos/edlib
@ -49,4 +45,4 @@
url = https://github.com/WerWolv/Disassembler url = https://github.com/WerWolv/Disassembler
[submodule "lib/third_party/md4c"] [submodule "lib/third_party/md4c"]
path = lib/third_party/md4c path = lib/third_party/md4c
url = https://github.com/mity/md4c url = https://github.com/mity/md4c

12
cmake/build_helpers.cmake
View File

@ -889,18 +889,6 @@ macro(addBundledLibraries)
find_package(LLVM REQUIRED Demangle) find_package(LLVM REQUIRED Demangle)
endif() endif()
if (NOT USE_SYSTEM_JTHREAD)
add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/jthread EXCLUDE_FROM_ALL)
set(JTHREAD_LIBRARIES jthread)
else()
find_path(JOSUTTIS_JTHREAD_INCLUDE_DIRS "condition_variable_any2.hpp")
include_directories(${JOSUTTIS_JTHREAD_INCLUDE_DIRS})
add_library(jthread INTERFACE)
target_include_directories(jthread INTERFACE ${JOSUTTIS_JTHREAD_INCLUDE_DIRS})
set(JTHREAD_LIBRARIES jthread)
endif()
if (USE_SYSTEM_BOOST) if (USE_SYSTEM_BOOST)
find_package(Boost REQUIRED CONFIG COMPONENTS regex) find_package(Boost REQUIRED CONFIG COMPONENTS regex)
set(BOOST_LIBRARIES Boost::regex) set(BOOST_LIBRARIES Boost::regex)

2
lib/external/libwolv vendored

@ -1 +1 @@
Subproject commit 577213efe6f8f5ee63ce3bb9c9d06508a058fb3e Subproject commit fb7096d5aed18567a6349ed5a8213e7f7530d7f6

6
lib/third_party/jthread/CMakeLists.txt vendored
View File

@ -1,6 +0,0 @@
cmake_minimum_required(VERSION 3.16)
project(jthread)
add_library(jthread INTERFACE)
target_include_directories(jthread INTERFACE includes)

11
lib/third_party/jthread/includes/jthread.hpp vendored
View File

@ -1,11 +0,0 @@
#pragma once
#if __cpp_lib_jthread >= 201911L
#include <thread>
#else
#define __stop_callback_base __stop_callback_base_j
#define __stop_state __stop_state_j
#include "../jthread/source/jthread.hpp"
#undef __stop_callback_base
#undef __stop_state
#endif

1
lib/third_party/jthread/jthread vendored

@ -1 +0,0 @@
Subproject commit 0fa8d394254886c555d6faccd0a3de819b7d47f8