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

[tomlplusplus] Add new port #10786

Merged
merged 8 commits into from
Jul 31, 2020
Merged

[tomlplusplus] Add new port #10786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a8ddcfd
vcpkg_fixup_cmake_targets: Add support for processing cmake config fi…
traversaro Apr 11, 2020
fa0e518
Add tomlplusplus
traversaro Apr 9, 2020
053cc3f
Merge remote-tracking branch 'origin/master' into add-tomlplusplus
BillyONeal Jul 7, 2020
1260dbd
Resolve conflicts
LilyWangL Jul 8, 2020
2c6492e
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jul 13, 2020
e11539f
Update scripts/ci.baseline.txt
Cheney-W Jul 14, 2020
28699e5
[tomplusplus] Update ci.basline.txt
LilyWangL Jul 14, 2020
f1f9801
Merge branch 'master' into add-tomlplusplus
traversaro Jul 18, 2020
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
5 changes: 5 additions & 0 deletions ports/tomlplusplus/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Source: tomlplusplus
Version: 1.3.0-3
Homepage: https://marzer.github.io/tomlplusplus/
Description: Header-only TOML config file parser and serializer for modern C++.
Supports: !(arm|uwp|linux|osx)
24 changes: 24 additions & 0 deletions ports/tomlplusplus/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "osx" "uwp")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO marzer/tomlplusplus
REF v1.3.0
SHA512 3c758c59f4bddfc646b596c358909f37c35d3e7200bd04663bf8c6493c2f64797352dd8a788e68bcc1a785fa41ac2dfc5621bf5328018748bdc3c5cea621b3bc
HEAD_REF master
)

vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DGENERATE_CMAKE_CONFIG=enabled
-DBUILD_TESTS=disabled
-DBUILD_EXAMPLES=disabled
)

vcpkg_install_meson()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
4 changes: 4 additions & 0 deletions scripts/cmake/vcpkg_fixup_cmake_targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ function(vcpkg_fixup_cmake_targets)
"get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\./(\\.\\./)*\" ABSOLUTE\\)"
"get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)"
_contents "${_contents}")
string(REGEX REPLACE
"get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\.((\\\\|/)\\.\\.)*\" ABSOLUTE\\)"
"get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)"
_contents "${_contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955
#Fix wrongly absolute paths to install dir with the correct dir using ${_IMPORT_PREFIX}
string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${_IMPORT_PREFIX}]] _contents "${_contents}")
file(WRITE ${MAIN_CMAKE} "${_contents}")
Expand Down