mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[brigand] Fix pkgconfig file and modernize portfile.cmake. (#21009)
* [brigand] Fix pkgconfig file and modernize portfile.cmake. * Undo patch patch and add version. * Depend only on boost-fusion and boost-variant, as suggested by PhoebeHui Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update version database. Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
This commit is contained in:
parent
62de5626aa
commit
95db7663b9
@ -1,14 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 13ea689..9d20700 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -292,3 +292,9 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/brigand
|
||||
install(FILES ${CMAKE_BINARY_DIR}/libbrigand.pc
|
||||
DESTINATION lib/pkgconfig
|
||||
)
|
||||
+
|
||||
+install(TARGETS brigand
|
||||
+ RUNTIME DESTINATION bin
|
||||
+ LIBRARY DESTINATION lib
|
||||
+ ARCHIVE DESTINATION lib
|
||||
+)
|
@ -6,22 +6,15 @@ vcpkg_from_github(
|
||||
REF 1.3.0
|
||||
SHA512 538d288d84265cc9a4563f1e84d55a174db461ffd1e4f510bfdaef04af9fbf8e7ca79817f9118378bf7d58d578699aae3072bbffa3fd727b2d93ee783337aea6
|
||||
HEAD_REF master
|
||||
PATCHES fix-install-targets.patch
|
||||
PATCHES
|
||||
remove-tests.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
)
|
||||
vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pkgconfig)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
# Handle copyright
|
||||
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
55
ports/brigand/remove-tests.patch
Normal file
55
ports/brigand/remove-tests.patch
Normal file
@ -0,0 +1,55 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 13ea689..e723f85 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -24,11 +24,6 @@ else()
|
||||
endif()
|
||||
|
||||
# Install pre-commit git hook
|
||||
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy
|
||||
- ${PROJECT_SOURCE_DIR}/script/pre-commit
|
||||
- ${PROJECT_SOURCE_DIR}/.git/hooks
|
||||
- )
|
||||
-
|
||||
set ( STANDALONE_GROUP
|
||||
script/embed.py
|
||||
)
|
||||
@@ -204,17 +199,6 @@ source_group(brigand\\sequences FILES ${SEQUENCES_GROUP})
|
||||
source_group(brigand\\types FILES ${TYPES_GROUP})
|
||||
source_group(placeholder FILES ${PLACEHOLDER_GROUP})
|
||||
|
||||
-add_library(brigand
|
||||
- ${BRIGAND_GROUP}
|
||||
- ${ADAPTED_GROUP}
|
||||
- ${ALGORITHMS_GROUP}
|
||||
- ${ALGORITHMS_DETAIL_GROUP}
|
||||
- ${FUNCTIONS_GROUPS}
|
||||
- ${SEQUENCES_GROUP}
|
||||
- ${TYPES_GROUP}
|
||||
- ${PLACEHOLDER_GROUP}
|
||||
-)
|
||||
-
|
||||
set(test_files
|
||||
test/always.cpp
|
||||
test/apply.cpp
|
||||
@@ -276,10 +260,6 @@ endif()
|
||||
|
||||
source_group(tests FILES ${test_files})
|
||||
|
||||
-add_executable(brigand_test ${test_files})
|
||||
-
|
||||
-add_test(brigand brigand_test)
|
||||
-
|
||||
configure_file(libbrigand.pc.in
|
||||
libbrigand.pc
|
||||
@ONLY
|
||||
diff --git a/libbrigand.pc.in b/libbrigand.pc.in
|
||||
index 2ed570e..218215b 100644
|
||||
--- a/libbrigand.pc.in
|
||||
+++ b/libbrigand.pc.in
|
||||
@@ -6,5 +6,4 @@ Name: Brigand
|
||||
Description: Light-weight, fully functional, instant-compile time C++ 11 meta-programming library
|
||||
URL: https://github.com/edouarda/brigand
|
||||
Version: 1.2.0
|
||||
-Libs:
|
||||
Cflags: -I${includedir}
|
@ -1,10 +1,15 @@
|
||||
{
|
||||
"name": "brigand",
|
||||
"version-string": "1.3.0",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.",
|
||||
"homepage": "https://github.com/edouarda/brigand",
|
||||
"dependencies": [
|
||||
"boost"
|
||||
"boost-fusion",
|
||||
"boost-variant",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a27641e46efb007b46792b7bd803f32437fe4178",
|
||||
"version-string": "1.3.0",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "99395d0e7569b8b32f76d99cf2183a2a92679a7d",
|
||||
"version-string": "1.3.0",
|
||||
|
@ -1138,7 +1138,7 @@
|
||||
},
|
||||
"brigand": {
|
||||
"baseline": "1.3.0",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"brotli": {
|
||||
"baseline": "1.0.9",
|
||||
|
Loading…
x
Reference in New Issue
Block a user