Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add jthread repo #5236

Merged
merged 8 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions packages/j/jthread/patches/1.3.3/cmakelist.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 517e13f..3224c46 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,7 @@ else ()
set(JTHREAD_COMPILE_STATIC ON CACHE BOOL "Flag indicating if a static library should be built, or a dynamic one")
endif ()

-if (NOT MSVC OR JTHREAD_COMPILE_STATIC)
+if (NOT MSVC AND JTHREAD_COMPILE_STATIC)
set(JTHREAD_INSTALLTARGETS jthread-static)
add_library(jthread-static STATIC ${SOURCES} ${HEADERS})
set_target_properties(jthread-static PROPERTIES OUTPUT_NAME jthread)
36 changes: 36 additions & 0 deletions packages/j/jthread/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package("jthread")
set_homepage("https://github.com/j0r1/JThread")
set_description("The JThread package provides some classes to make use of threads easy on different platforms")
set_license("MIT")

add_urls("https://github.com/j0r1/JThread.git")

add_versions("2023.08.18", "719413043807b77448df3ba1c749798fb72ee459")
add_deps("cmake")

add_patches("1.3.3", "patches/1.3.3/cmakelist.patch", "4c5162f128f31ebee63805db1dbed0a17fc02b2661958b80468fcffc394d7f4e")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

补丁可以去掉了

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果去掉补丁会在shared=true时,仍然会生成静态库

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修改补丁


add_includedirs("include", "include/jthread")

on_install("windows", "linux", "macosx", function(package)

star-hengxing marked this conversation as resolved.
Show resolved Hide resolved
local configs = {}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
if package:config("shared") then
table.insert(configs, "-DJTHREAD_COMPILE_STATIC=OFF")
table.insert(configs, "-DJTHREAD_COMPILE_STATIC_ONLY=OFF")
else
table.insert(configs, "-DJTHREAD_COMPILE_STATIC_ONLY=ON")
table.insert(configs, "-DJTHREAD_COMPILE_STATIC=ON")
end

import("package.tools.cmake").install(package, configs)
end)

on_test(function (package)
assert(package:check_cxxsnippets({test = [[
using namespace jthread;
class TestThread : public JThread{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

纯类型定义,没任何实例化对象,测不到 links 吧

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修改

};
]]}, {configs = {languages = "c++11"}, includes = "jthread.h"}))
end)
Loading