diff options
| author | Stephen E. Baker <baker.stephen.e@gmail.com> | 2020-05-27 00:32:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 21:32:47 -0700 |
| commit | 46d0f05e2dc8c2df63dfb6e81294d88cf99c391a (patch) | |
| tree | 08860b8c94c5c259a612953921bda599d62a5e63 /ports/lpeg | |
| parent | cff57958e7025176ee3af5c027b417c4dcc44d80 (diff) | |
| download | vcpkg-46d0f05e2dc8c2df63dfb6e81294d88cf99c391a.tar.gz vcpkg-46d0f05e2dc8c2df63dfb6e81294d88cf99c391a.zip | |
[luafilesystem][lpeg] Bump versions (#11554)
* Bump luafilesytem to 1.8.0 and lpeg to 1.0.2
* Code review changes for lpeg / luafilesystem
* [lpeg][luafilesystem] Remove windows only gates
* Remove failures from baseline
Diffstat (limited to 'ports/lpeg')
| -rw-r--r-- | ports/lpeg/CMakeLists.txt | 52 | ||||
| -rw-r--r-- | ports/lpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/lpeg/portfile.cmake | 9 |
3 files changed, 28 insertions, 35 deletions
diff --git a/ports/lpeg/CMakeLists.txt b/ports/lpeg/CMakeLists.txt index f5a72fad4..993e570d7 100644 --- a/ports/lpeg/CMakeLists.txt +++ b/ports/lpeg/CMakeLists.txt @@ -1,28 +1,24 @@ -cmake_minimum_required(VERSION 3.0) -project(lpeg) - -if(NOT WIN32) - message(FATAL_ERROR "Written for windows only") -endif() - -find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua) -find_library(LUA_LIBRARY lua) -set(LPEG_INCLUDES ${LUA_INCLUDE_DIR}) -set(LPEG_LIBRARIES ${LUA_LIBRARY}) - -add_library(lpeg - lpvm.c - lptree.c - lpprint.c - lpcap.c - lpcode.c - lpeg.def) - -target_include_directories(lpeg PRIVATE ${LPEG_INCLUDES}) -target_link_libraries(lpeg PRIVATE ${LPEG_LIBRARIES}) - -install(TARGETS lpeg - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -install(FILES re.lua DESTINATION share/lua) +cmake_minimum_required(VERSION 3.0)
+project(lpeg)
+
+find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua)
+find_library(LUA_LIBRARY lua)
+set(LPEG_INCLUDES ${LUA_INCLUDE_DIR})
+set(LPEG_LIBRARIES ${LUA_LIBRARY})
+
+add_library(lpeg
+ lpvm.c
+ lptree.c
+ lpprint.c
+ lpcap.c
+ lpcode.c
+ lpeg.def)
+
+target_include_directories(lpeg PRIVATE ${LPEG_INCLUDES})
+target_link_libraries(lpeg PRIVATE ${LPEG_LIBRARIES})
+
+install(TARGETS lpeg
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+install(FILES re.lua DESTINATION share/lua)
diff --git a/ports/lpeg/CONTROL b/ports/lpeg/CONTROL index d3abb132c..c88fdada2 100644 --- a/ports/lpeg/CONTROL +++ b/ports/lpeg/CONTROL @@ -1,5 +1,5 @@ Source: lpeg -Version: 1.0.1-4 +Version: 1.0.2-1 Homepage: https://www.inf.puc-rio.br/~roberto/lpeg Description: LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs). Build-Depends: lua diff --git a/ports/lpeg/portfile.cmake b/ports/lpeg/portfile.cmake index f37a350c3..24d77f00b 100644 --- a/ports/lpeg/portfile.cmake +++ b/ports/lpeg/portfile.cmake @@ -1,12 +1,9 @@ -#cmake-only scripts -include(vcpkg_common_functions) - -set(LPEG_VER 1.0.1) +set(LPEG_VER 1.0.2) vcpkg_download_distfile(ARCHIVE URLS "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${LPEG_VER}.tar.gz" FILENAME "lpeg-${LPEG_VER}.tar.gz" - SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa + SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814 ) vcpkg_extract_source_archive_ex( @@ -28,7 +25,7 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(INSTALL ${SOURCE_PATH}/lpeg.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/lpeg RENAME copyright) +file(INSTALL ${SOURCE_PATH}/lpeg.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) |