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.

Sign up for GitHub

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

Jump to bottom

msgpack-cxx: make headeronly and boost optional #4648

Merged
merged 16 commits into from
Jul 14, 2024
Merged

msgpack-cxx: make headeronly and boost optional #4648

Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5871a9f
msgpack-cxx: make option to not use boost
Chi-EEE Jul 13, 2024
69d0fb6
msgpack-cxx: test remove limits
Chi-EEE Jul 13, 2024
9a08d69
msgpack-cxx: test with boost
Chi-EEE Jul 13, 2024
ff44321
msgpack-cxx: move MSGPACK_NO_BOOST into on_load
Chi-EEE Jul 13, 2024
311850d
msgpack-cxx: make headeronly
Chi-EEE Jul 13, 2024
89d02e3
msgpack-cxx: remove cmake
Chi-EEE Jul 13, 2024
6361a9f
msgpack-cxx: add config header_only
Chi-EEE Jul 13, 2024
32fb42d
Revert "msgpack-cxx: add config header_only"
Chi-EEE Jul 13, 2024
33bc7cc
Reapply "msgpack-cxx: add config header_only"
Chi-EEE Jul 14, 2024
8803174
msgpack-cxx: add `set_kind("library", {headeronly = true})`
Chi-EEE Jul 14, 2024
ef09292
msgpack-cxx: remove `package:set("kind", "library", {headeronly = tru…
Chi-EEE Jul 14, 2024
a31aa01
msgpack-cxx: disable boost for unsupported plats
Chi-EEE Jul 14, 2024
600e362
msgpack-cxx: on line boost config
Chi-EEE Jul 14, 2024
db0f2b8
msgpack-cxx: add `package:set("kind", "library", {headeronly = true})`
Chi-EEE Jul 14, 2024
58470df
msgpack-cxx: add requested
Chi-EEE Jul 14, 2024
528efea
msgpack-cxx: remove header_only config
Chi-EEE Jul 14, 2024
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
41 changes: 30 additions & 11 deletions packages/m/msgpack-cxx/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package("msgpack-cxx")

set_kind("library", {headeronly = true})
Copy link
Member

Choose a reason for hiding this comment

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

we should set it dynamicaly in on_load. use package:config("header_only")

Copy link
Contributor Author

@Chi-EEE Chi-EEE Jul 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

setting it dynamically in on_load would not work as the cmake file does not generate a .lib file if it is not linked with boost, it only generates a lib file when linking with boost

Copy link
Member

Choose a reason for hiding this comment

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

package:config("header_only") should be consistent with the state of set_kind("library", {headeronly = true}), otherwise there is no point in adding header_only config.

If the library is always headeronly, we shouldn't add add_configs("header_only")

set_homepage("https://msgpack.org/")
set_description("MessagePack implementation for C++")
set_license("BSL-1.0")
Expand All @@ -9,20 +9,39 @@ package("msgpack-cxx")
add_versions("6.1.0", "23ede7e93c8efee343ad8c6514c28f3708207e5106af3b3e4969b3a9ed7039e7")
add_versions("4.1.1", "8115c5edcf20bc1408c798a6bdaec16c1e52b1c34859d4982a0fb03300438f0b")

add_configs("header_only", {description = "Use header only version.", default = false, type = "boolean"})
Chi-EEE marked this conversation as resolved.
Show resolved Hide resolved
add_configs("std", {description = "Choose C++ standard version.", default = "cxx17", type = "string", values = {"cxx98", "cxx11", "cxx14", "cxx17", "cxx20"}})
add_configs("boost", {description = "Use Boost", default = is_plat("macosx", "linux", "windows", "bsd", "mingw", "cross"), type = "boolean"})

add_deps("cmake", "boost")
on_install("windows", "macosx", "linux", "mingw", function (package)
local configs = {"-DMSGPACK_BUILD_EXAMPLES=OFF", "-DMSGPACK_BUILD_TESTS=OFF", "-DMSGPACK_BUILD_DOCS=OFF", "-DMSGPACK_USE_STATIC_BOOST=ON"}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
if package:config("std") ~= "cxx98" then
table.insert(configs, "-DMSGPACK_" .. package:config("std"):upper() .. "=ON")
on_load(function (package)
if not package:config("header_only") then
package:add("deps", "cmake")
end
if package:config("boost") then
package:add("deps", "boost")
else
package:add("defines", "MSGPACK_NO_BOOST")
end
if package:is_plat("windows") then
table.insert(configs, "-DBoost_USE_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF"))
end)

on_install(function (package)
if package:config("header_only") then
os.cp("include", package:installdir())
else
local configs = {"-DMSGPACK_BUILD_EXAMPLES=OFF", "-DMSGPACK_BUILD_TESTS=OFF", "-DMSGPACK_BUILD_DOCS=OFF"}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
if package:config("std") ~= "cxx98" then
table.insert(configs, "-DMSGPACK_" .. package:config("std"):upper() .. "=ON")
end
if package:config("boost") then
table.insert(configs, "-DMSGPACK_USE_STATIC_BOOST=ON")
table.insert(configs, "-DMSGPACK_USE_BOOST=ON")
else
table.insert(configs, "-DMSGPACK_USE_BOOST=OFF")
end
import("package.tools.cmake").install(package, configs)
end
import("package.tools.cmake").install(package, configs)
end)

on_test(function (package)
Expand Down
Loading