Merge remote-tracking branch 'myk002/myk_luacov_depends' into develop

develop
lethosor 2021-03-10 00:20:41 -05:00
commit fba54301b2
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
4 changed files with 9 additions and 0 deletions

4
.gitmodules vendored

@ -28,3 +28,7 @@
path = depends/libexpat
url = ../../DFHack/libexpat.git
shallow = true
[submodule "depends/luacov"]
path = depends/luacov
url = ../../keplerproject/luacov.git
shallow = true

@ -27,6 +27,7 @@ libexpat_ MIT \(c\) 1998-2000 Thai Open Source Software Center L
libzip_ BSD 3-clause \(c\) 1999-2020 Dieter Baron and Thomas Klausner
linenoise_ BSD 2-clause \(c\) 2010, Salvatore Sanfilippo & Pieter Noordhuis
lua_ MIT \(c\) 1994-2008, Lua.org, PUC-Rio.
luacov_ MIT \(c\) 2007 - 2018 Hisham Muhammad
luafilesystem_ MIT \(c\) 2003-2014, Kepler Project
lua-profiler_ MIT \(c\) 2002,2003,2004 Pepperfish
protobuf_ BSD 3-clause \(c\) 2008, Google Inc.
@ -46,6 +47,7 @@ alt-getopt_ MIT \(c\) 2009 Aleksey Cheusov
.. _libzip: https://github.com/nih-at/libzip
.. _linenoise: http://github.com/antirez/linenoise
.. _lua: http://www.lua.org
.. _luacov: https://github.com/keplerproject/luacov
.. _luafilesystem: https://github.com/keplerproject/luafilesystem
.. _lua-profiler: http://lua-users.org/wiki/PepperfishProfiler
.. _protobuf: https://github.com/google/protobuf

@ -22,6 +22,8 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
add_subdirectory(clsocket)
ide_folder(clsocket "Depends")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/luacov/src/luacov/ DESTINATION ${DFHACK_DATA_DESTINATION}/lua/luacov)
# set the default values of libexpat options - the descriptions are left empty
# because later option() calls *do* override those
set(EXPAT_BUILD_EXAMPLES OFF CACHE BOOL "")

@ -0,0 +1 @@
Subproject commit 19b52ca0298c8942df82dd441d7a4a588db4c413