From db13360a5076f88c8eb2d95c67f9e83ad2b7ca14 Mon Sep 17 00:00:00 2001 From: JackBoosY <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 30 Mar 2019 13:51:58 +0800 Subject: [luajit]move luajit headers to the directory "include/luajit/" to avoid file conflicts. (#5863) [luajit]move luajit headers to the directory "include/luajit/" to avoid file conflicts. --- ports/luajit/CONTROL | 2 +- ports/luajit/portfile.cmake | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/luajit/CONTROL b/ports/luajit/CONTROL index 5a5ad6b91..e81524ec7 100644 --- a/ports/luajit/CONTROL +++ b/ports/luajit/CONTROL @@ -1,3 +1,3 @@ Source: luajit -Version: 2.0.5 +Version: 2.0.5-1 Description: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index da68d3ad4..326929d17 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -73,12 +73,12 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() vcpkg_copy_pdbs() -file(INSTALL ${SRC}/lua.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SRC}/luajit.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SRC}/luaconf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SRC}/lualib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SRC}/lauxlib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SRC}/lua.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SRC}/lua.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit) +file(INSTALL ${SRC}/luajit.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit) +file(INSTALL ${SRC}/luaconf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit) +file(INSTALL ${SRC}/lualib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit) +file(INSTALL ${SRC}/lauxlib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit) +file(INSTALL ${SRC}/lua.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/luajit) file(REMOVE "${SRC}/*.dll") file(REMOVE "${SRC}/*.exe") -- cgit v1.2.3