aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-06-09 22:24:04 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-06-09 22:24:04 -0700
commit29681a5773be9b6be55b0d021b51aef01cebffec (patch)
tree844f1f7d5ef8db45161d589f32e8b9ca1979d113
parent1653cf43632a5914ff7da8e7b1260dc578393daf (diff)
downloadvcpkg-29681a5773be9b6be55b0d021b51aef01cebffec.tar.gz
vcpkg-29681a5773be9b6be55b0d021b51aef01cebffec.zip
[lpeg] Use copyright file from sources
-rw-r--r--ports/lpeg/CONTROL2
-rw-r--r--ports/lpeg/COPYRIGHT7
-rw-r--r--ports/lpeg/portfile.cmake3
3 files changed, 3 insertions, 9 deletions
diff --git a/ports/lpeg/CONTROL b/ports/lpeg/CONTROL
index f1eeae348..edb3e1712 100644
--- a/ports/lpeg/CONTROL
+++ b/ports/lpeg/CONTROL
@@ -1,4 +1,4 @@
Source: lpeg
-Version: 1.0.1
+Version: 1.0.1-1
Description: LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).
Build-Depends: lua
diff --git a/ports/lpeg/COPYRIGHT b/ports/lpeg/COPYRIGHT
deleted file mode 100644
index 7870c54ce..000000000
--- a/ports/lpeg/COPYRIGHT
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright © 2007-2017 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/ports/lpeg/portfile.cmake b/ports/lpeg/portfile.cmake
index 5a36f7944..8b8af69d2 100644
--- a/ports/lpeg/portfile.cmake
+++ b/ports/lpeg/portfile.cmake
@@ -17,6 +17,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/lpeg.def DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
)
vcpkg_install_cmake()
@@ -25,7 +26,7 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lpeg)
+file(COPY ${SOURCE_PATH}/lpeg DESTINATION ${CURRENT_PACKAGES_DIR}/share/lpeg)
# Allow empty include directory
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)