From 78f707805c9786ed8c12b4b22504be12cff9c0cb Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 20 Apr 2019 23:50:54 +0200 Subject: [PATCH] moria: allow out of src builds --- packages/moria/CMakeLists.txt.patch | 25 ++++++++++++++++++++----- packages/moria/build.sh | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/packages/moria/CMakeLists.txt.patch b/packages/moria/CMakeLists.txt.patch index 3f7136de6..ef14955d5 100644 --- a/packages/moria/CMakeLists.txt.patch +++ b/packages/moria/CMakeLists.txt.patch @@ -1,11 +1,26 @@ --- ../CMakeLists.txt.orig 2019-04-20 20:35:53.547906398 +0000 -+++ ./CMakeLists.txt 2019-04-20 21:28:56.287810505 +0000 -@@ -162,7 +162,7 @@ ++++ ./CMakeLists.txt 2019-04-20 21:47:17.644443892 +0000 +@@ -156,16 +156,12 @@ + # + # Set up the install paths and files + # +-set(build_dir "umoria") ++option(build_dir "Directory for build files" "umoria") + set(data_dir "${build_dir}/data") + file(MAKE_DIRECTORY ${build_dir}) file(MAKE_DIRECTORY ${data_dir}) -set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) -+# set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) - set(EXECUTABLE_OUTPUT_PATH ${build_dir}) - set(RUNTIME_OUTPUT_DIRECTORY ${build_dir}) +-set(EXECUTABLE_OUTPUT_PATH ${build_dir}) +-set(RUNTIME_OUTPUT_DIRECTORY ${build_dir}) +- + # Core game data files + set( + data_files +@@ -268,4 +264,4 @@ + target_link_libraries(umoria ${CURSES_LIBRARIES}) + # Build and install the umoria binary +-install(TARGETS umoria DESTINATION ${build_dir}) ++install(TARGETS umoria DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/) diff --git a/packages/moria/build.sh b/packages/moria/build.sh index 63347c141..b2f4f8958 100644 --- a/packages/moria/build.sh +++ b/packages/moria/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_SRCURL=https://github.com/dungeons-of-moria/umoria/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=a43b695d42692245208e9fca4c89976c24947ea7931caa80f79e7f051305b512 TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-Dbuild_dir=$TERMUX_PKG_BUILDDIR" termux_step_create_debscripts() { # Create scores file in a debscript, so an update to the package wouldn't erease any scores