diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-11-14 05:38:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 13:38:59 -0800 |
| commit | 4073d297e1b07b4ccbadd053680327bd13afd3d0 (patch) | |
| tree | 966334dd91b482570cadd83ab697050fe13b6e8c | |
| parent | 9ee052937cdb14dd0150828306b22784cb122162 (diff) | |
| download | vcpkg-4073d297e1b07b4ccbadd053680327bd13afd3d0.tar.gz vcpkg-4073d297e1b07b4ccbadd053680327bd13afd3d0.zip | |
[boost] Install usage file (#14517)
* [boost] Install usage file
* Switch to target style
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 1 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 3 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/usage | 4 | ||||
| -rw-r--r-- | ports/boost-vcpkg-helpers/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-vcpkg-helpers/boost-modular-headers.cmake | 2 | ||||
| -rw-r--r-- | ports/boost-vcpkg-helpers/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/boost-vcpkg-helpers/usage | 4 |
8 files changed, 19 insertions, 5 deletions
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 6921a7e61..42efdcaf8 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,3 +1,4 @@ Source: boost-modular-build-helper
Version: 1.74.0
+Port-Version: 1
Build-Depends: boost-uninstall
\ No newline at end of file diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 83a76c073..06cebed39 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -148,6 +148,8 @@ function(boost_modular_build) if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/lib)
message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.")
endif()
+
+ file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-build/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
return()
endif()
@@ -446,4 +448,5 @@ function(boost_modular_build) endif()
vcpkg_copy_pdbs()
+ file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-build/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
endfunction()
diff --git a/ports/boost-modular-build-helper/portfile.cmake b/ports/boost-modular-build-helper/portfile.cmake index 5f63ce5d8..8224bb957 100644 --- a/ports/boost-modular-build-helper/portfile.cmake +++ b/ports/boost-modular-build-helper/portfile.cmake @@ -7,6 +7,7 @@ file( ${CMAKE_CURRENT_LIST_DIR}/nothing.bat
${CMAKE_CURRENT_LIST_DIR}/user-config.jam
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+ ${CMAKE_CURRENT_LIST_DIR}/usage
DESTINATION
${CURRENT_PACKAGES_DIR}/share/boost-build
)
\ No newline at end of file diff --git a/ports/boost-modular-build-helper/usage b/ports/boost-modular-build-helper/usage new file mode 100644 index 000000000..89a0376da --- /dev/null +++ b/ports/boost-modular-build-helper/usage @@ -0,0 +1,4 @@ +The package boost is compatible with built-in CMake targets:
+
+ find_package(Boost REQUIRED [COMPONENTS <libs>...])
+ target_link_libraries(main PRIVATE Boost::boost Boost::<lib1> Boost::<lib2> ...)
diff --git a/ports/boost-vcpkg-helpers/CONTROL b/ports/boost-vcpkg-helpers/CONTROL index 1b1642e17..e2c97b035 100644 --- a/ports/boost-vcpkg-helpers/CONTROL +++ b/ports/boost-vcpkg-helpers/CONTROL @@ -1,5 +1,5 @@ Source: boost-vcpkg-helpers
Version: 7
-Port-Version: 1
+Port-Version: 2
Description: a set of vcpkg-internal scripts used to modularize boost
Build-Depends: boost-uninstall
\ No newline at end of file diff --git a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake index 86c45be7b..2be7c6446 100644 --- a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake +++ b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake @@ -19,6 +19,6 @@ function(boost_modular_headers) FILENAME "boost_LICENSE_1_0.txt"
SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
)
-
+ file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
endfunction()
diff --git a/ports/boost-vcpkg-helpers/portfile.cmake b/ports/boost-vcpkg-helpers/portfile.cmake index 32f501f24..0233bda5a 100644 --- a/ports/boost-vcpkg-helpers/portfile.cmake +++ b/ports/boost-vcpkg-helpers/portfile.cmake @@ -1,7 +1,8 @@ -file(
- COPY ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake
- DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-vcpkg-helpers
+file(COPY
+ ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake
+ ${CMAKE_CURRENT_LIST_DIR}/usage
+ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/boost-vcpkg-helpers/usage b/ports/boost-vcpkg-helpers/usage new file mode 100644 index 000000000..89a0376da --- /dev/null +++ b/ports/boost-vcpkg-helpers/usage @@ -0,0 +1,4 @@ +The package boost is compatible with built-in CMake targets:
+
+ find_package(Boost REQUIRED [COMPONENTS <libs>...])
+ target_link_libraries(main PRIVATE Boost::boost Boost::<lib1> Boost::<lib2> ...)
|
