MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3rd-party-scripts' into develop

develop
lethosor 2015-09-14 16:52:13 -04:00
parent b58ccc9e55 9a58332aed
commit d696832efa
6 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
Unescape Escape View File

@ -13,3 +13,6 @@
[submodule "depends/clsocket"] [submodule "depends/clsocket"]
path = depends/clsocket path = depends/clsocket
url = git://github.com/DFHack/clsocket.git url = git://github.com/DFHack/clsocket.git
[submodule "scripts/3rdparty/lethosor"]
path = scripts/3rdparty/lethosor
url = https://github.com/lethosor/dfhack-scripts

2
CMakeLists.txt
Unescape Escape View File

@ -184,6 +184,8 @@ IF(BUILD_PLUGINS)
add_subdirectory (plugins) add_subdirectory (plugins)
endif() endif()
add_subdirectory(scripts)
# Packaging with CPack! # Packaging with CPack!
IF(UNIX) IF(UNIX)
if(APPLE) if(APPLE)

1
library/CMakeLists.txt
Unescape Escape View File

@ -376,6 +376,7 @@ install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts
DESTINATION ${DFHACK_DATA_DESTINATION} DESTINATION ${DFHACK_DATA_DESTINATION}
FILES_MATCHING PATTERN "*.lua" FILES_MATCHING PATTERN "*.lua"
PATTERN "*.rb" PATTERN "*.rb"
PATTERN "3rdparty" EXCLUDE
) )
install(DIRECTORY ${dfhack_SOURCE_DIR}/patches install(DIRECTORY ${dfhack_SOURCE_DIR}/patches

1
scripts/3rdparty/lethosor vendored

@ -0,0 +1 @@
Subproject commit ceed207e38220e21067a91b8d6f7b9680a476f69

2
scripts/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,2 @@
include(Scripts.cmake)
DFHACK_3RDPARTY_SCRIPT_REPO(lethosor)

19
scripts/Scripts.cmake
Unescape Escape View File

@ -0,0 +1,19 @@
include(../plugins/Plugins.cmake)
MACRO(DFHACK_SCRIPTS)
PARSE_ARGUMENTS(SCRIPT
"SUBDIRECTORY"
"SOME_OPT"
${ARGN}
)
CAR(SCRIPT_SUBDIRECTORY ${SCRIPT_SUBDIRECTORY})
install(FILES ${SCRIPT_DEFAULT_ARGS}
DESTINATION ${DFHACK_DATA_DESTINATION}/scripts/${SCRIPT_SUBDIRECTORY})
ENDMACRO()
MACRO(DFHACK_3RDPARTY_SCRIPT_REPO repo_path)
if(NOT EXISTS ${dfhack_SOURCE_DIR}/scripts/3rdparty/${repo_path}/CMakeLists.txt)
MESSAGE(FATAL_ERROR "Script submodule scripts/3rdparty/${repo_path} does not exist - run `git submodule update`.")
endif()
add_subdirectory(3rdparty/${repo_path})
ENDMACRO()