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

Jump to bottom

[luajit]move luajit headers to the directory "include/luajit/" to avoid file conflicts. #5863

Merged
merged 6 commits into from
Mar 30, 2019
Merged

[luajit]move luajit headers to the directory "include/luajit/" to avoid file conflicts. #5863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a833bf5
[jemalloc]Fix dll generated when generating static library
Mar 27, 2019
842596d
Revert "[jemalloc]Fix dll generated when generating static library"
Mar 27, 2019
9b14d4c
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Mar 28, 2019
4980716
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Mar 28, 2019
845dc72
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Mar 29, 2019
12e9970
[luajit]move luajit headers to the directory "include/luajit/" to avo…
Mar 29, 2019
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/luajit/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
12 changes: 6 additions & 6 deletions ports/luajit/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down