Auto-update promise-cpp to 2.1.5 (#4106)

* Update promise-cpp to 2.1.5

* port

* fix shared

---------

Co-authored-by: star9029 <hengxings783@gmail.com>
pull/3905/merge
ruki 8 months ago committed by GitHub
parent 761483e5a2
commit 61fac16ef3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 72
      packages/p/promise-cpp/patches/2.1.3/cmake.patch
  2. 19
      packages/p/promise-cpp/port/xmake.lua
  3. 31
      packages/p/promise-cpp/xmake.lua

@ -1,72 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd43e91..5ddef71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,26 +39,6 @@ else()
add_library(promise STATIC ${my_sources} ${my_headers})
endif()
-
-add_executable(test0 ${my_headers} example/test0.cpp)
-target_link_libraries(test0 PRIVATE promise)
-
-add_executable(simple_timer ${my_headers} example/simple_timer.cpp)
-target_link_libraries(simple_timer PRIVATE promise)
-
-add_executable(simple_benchmark_test ${my_headers} example/simple_benchmark_test.cpp)
-target_link_libraries(simple_benchmark_test PRIVATE promise)
-
-find_package(Threads)
-if(Threads_FOUND)
- add_executable(multithread_test ${my_headers} example/multithread_test.cpp)
- target_link_libraries(multithread_test PRIVATE promise Threads::Threads)
-endif()
-
-add_executable(chain_defer_test ${my_headers} example/chain_defer_test.cpp)
-target_link_libraries(chain_defer_test PRIVATE promise)
-
-
find_package(Boost)
if(NOT Boost_FOUND)
message(WARNING "Boost not found, so asio projects will not be compiled")
@@ -70,40 +50,4 @@ else()
endif (UNIX)
include_directories(. ./add_ons/asio)
-
- add_executable(asio_benchmark_test ${my_headers} example/asio_benchmark_test.cpp)
- target_compile_definitions(asio_benchmark_test PRIVATE BOOST_ALL_NO_LIB)
- target_link_libraries(asio_benchmark_test PRIVATE promise)
-
- add_executable(asio_timer ${my_headers} example/asio_timer.cpp)
- target_compile_definitions(asio_timer PRIVATE BOOST_ALL_NO_LIB)
- target_link_libraries(asio_timer PRIVATE promise)
-
- add_executable(asio_http_client ${my_headers} example/asio_http_client.cpp)
- target_compile_definitions(asio_http_client PRIVATE BOOST_ALL_NO_LIB)
- target_link_libraries(asio_http_client PRIVATE promise)
-
- add_executable(asio_http_server ${my_headers} example/asio_http_server.cpp)
- target_compile_definitions(asio_http_server PRIVATE BOOST_ALL_NO_LIB)
- target_link_libraries(asio_http_server PRIVATE promise)
-endif()
-
-
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets)
-if(NOT QT_DIR)
- message(WARNING "QT not found, so project qt_timer will not be compiled")
-else()
- if(PROMISE_BUILD_SHARED OR BUILD_SHARED_LIBS)
- add_library(promise_qt SHARED ./add_ons/qt/promise_qt.cpp ${my_headers})
- else()
- add_library(promise_qt STATIC ./add_ons/qt/promise_qt.cpp ${my_headers})
- endif()
- target_link_libraries(promise_qt PRIVATE promise Qt${QT_VERSION_MAJOR}::Widgets)
-
- add_subdirectory(./example/qt_timer)
-endif()
-
-if(MSVC)
- add_subdirectory(./example/mfc_timer)
endif()

@ -0,0 +1,19 @@
option("boost_asio", {showmenu = true, default = false})
add_rules("mode.debug", "mode.release")
set_languages("c++11")
if has_config("boost_asio") then
add_requires("boost")
add_packages("boost")
end
target("promise-cpp")
set_kind("$(kind)")
add_files("src/*.cpp")
add_includedirs(".", "include")
add_headerfiles("include/(**.hpp)", "(add_ons/**.hpp)")
if is_plat("windows") and is_kind("shared") then
add_defines("PROMISE_BUILD_SHARED")
end

@ -5,41 +5,21 @@ package("promise-cpp")
add_urls("https://github.com/xhawk18/promise-cpp/archive/refs/tags/$(version).tar.gz",
"https://github.com/xhawk18/promise-cpp.git")
add_versions("2.1.3", "831f5c7fb36a1f0adda408898038b428d4afe96e7028947be0f755c6851eec26")
add_patches("2.1.3", path.join(os.scriptdir(), "patches", "2.1.3", "cmake.patch"), "3ea274743d852c685e8a9fb4f609f768c2e5461061b87473092ee98c68e1ab88")
add_versions("2.1.5", "9608686d0d136323396a84c2f6046060a966ed10bf4bb7895ef87340c118b66a")
add_versions("2.1.3", "831f5c7fb36a1f0adda408898038b428d4afe96e7028947be0f755c6851eec26")
add_configs("boost_asio", { description = "Enable boost asio.", default = false, type = "boolean"})
add_deps("cmake")
add_includedirs("include", "include/promise-cpp")
on_load(function (package)
if package:config("boost_asio") then
package:add("deps", "boost")
end
end)
on_install("linux", "macosx", "windows", function (package)
local configs = {}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
table.insert(configs, "-DPROMISE_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF"))
import("package.tools.cmake").install(package, configs, {buildir = "build"})
os.cp("include", package:installdir())
os.cp("add_ons", package:installdir("include"))
if package:is_plat("linux") then
if package:config("shared") then
os.cp("build/*.so", package:installdir("lib"))
else
os.cp("build/*.a", package:installdir("lib"))
end
elseif package:is_plat("macosx") then
if package:config("shared") then
os.cp("build/*.dylib", package:installdir("lib"))
else
os.cp("build/*.a", package:installdir("lib"))
end
end
on_install(function (package)
os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua")
import("package.tools.xmake").install(package, {boost_asio = package:config("boost_asio")})
end)
on_test(function (package)
@ -86,4 +66,3 @@ package("promise-cpp")
assert(package:has_cxxtypes("promise::Promise", {configs = {languages = "c++14"}, includes = "promise-cpp/promise.hpp"}))
end
end)

Loading…
Cancel
Save