mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-03-27 23:37:05 -05:00
build: Move jthread library to libwolv
This commit is contained in:
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -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
|
||||||
|
|||||||
@@ -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
2
lib/external/libwolv
vendored
Submodule lib/external/libwolv updated: 577213efe6...fb7096d5ae
6
lib/third_party/jthread/CMakeLists.txt
vendored
6
lib/third_party/jthread/CMakeLists.txt
vendored
@@ -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
11
lib/third_party/jthread/includes/jthread.hpp
vendored
@@ -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
lib/third_party/jthread/jthread
vendored
Submodule lib/third_party/jthread/jthread deleted from 0fa8d39425
Reference in New Issue
Block a user