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

[crfft, constexpr] Fix copyright location #25241

Merged
merged 4 commits into from
Jun 15, 2022
Merged

[crfft, constexpr] Fix copyright location #25241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6ef6ec
[clfft,constexpr] Fix copyright
Thomas1664 Jun 14, 2022
e16730f
version
Thomas1664 Jun 14, 2022
0ef862f
Fix cmake
Thomas1664 Jun 14, 2022
51aa4d9
version
Thomas1664 Jun 14, 2022
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
2 changes: 1 addition & 1 deletion ports/clfft/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ endif()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clfft/copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
3 changes: 2 additions & 1 deletion ports/clfft/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "clfft",
"version": "2.12.2",
"port-version": 4,
"port-version": 5,
"description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.",
"homepage": "https://github.com/clMathLibraries/clFFT",
"license": "Apache-2.0",
"dependencies": [
"opencl",
{
Expand Down
10 changes: 4 additions & 6 deletions ports/constexpr/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ vcpkg_from_github(
HEAD_REF master
)

# Put the licence file where vcpkg expects it
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE ${CURRENT_PACKAGES_DIR}/share/constexpr/copyright)

# Copy the constexpr header files
file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h)
file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/*.h")
file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
7 changes: 4 additions & 3 deletions ports/constexpr/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "constexpr",
"version-string": "1.0",
"port-version": 2,
"version": "1.0",
"port-version": 3,
"description": "Small MIT License Library of general stdlib functions written as C++11 constexpr functions.",
"homepage": "https://github.com/elbeno/constexpr"
"homepage": "https://github.com/elbeno/constexpr",
"license": "MIT"
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@
},
"clfft": {
"baseline": "2.12.2",
"port-version": 4
"port-version": 5
},
"cli": {
"baseline": "2.0.1",
Expand Down Expand Up @@ -1542,7 +1542,7 @@
},
"constexpr": {
"baseline": "1.0",
"port-version": 2
"port-version": 3
},
"constexpr-contracts": {
"baseline": "2020-08-09",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/clfft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b935ce5f9e186f9be8fe85d6d228043bede4cd04",
"version": "2.12.2",
"port-version": 5
},
{
"git-tree": "fdb3022cd3081e404b7c49ceaa5bd03ad0dc64f4",
"version": "2.12.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/constexpr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c3d2008ccf999119285610e0a76ed0c46c59632b",
"version": "1.0",
"port-version": 3
},
{
"git-tree": "26c459ddb2becb06ea5c1fcb7a55e282b2aae704",
"version-string": "1.0",
Expand Down