From bdf602f48194058d998909a233556cc57bac303e Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Fri, 16 Feb 2018 21:55:10 +0100 Subject: Add cpack directive and update README --- CMakeLists.txt | 7 +++++++ README.md | 20 ++++++++++++++++++++ src/main/resources/items/items_template.xml | 14 +++++++++----- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b81e25..91774af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,3 +34,10 @@ endif () # install target install(TARGETS ${EXECUTABLE_NAME} DESTINATION bin) + +# CPack packaging +include(InstallRequiredSystemLibraries) +# set(CPACK_RESOURCES_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") +set(CPACK_PACKAGE_VERSION_MAJOR "${subconscious_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${subconscious_VERSION_MINOR}") +include(CPack) diff --git a/README.md b/README.md index 8223af0..27a8e08 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,23 @@ ``` gradle libsfml-dev ``` + +# Build +### With Gradle +``` +gradle mainExecutable +``` + +### With CMake +On Debian the `libfsml-dev` package does not installs itself in +`/usr/share/cmake-x.x/Modules` and so it must be done manually. +``` +sudo cp /usr/share/SFML/cmake/Modules/FindSFML.cmake \ + /usr/share/cmake-3.7/Modules +``` + +``` +cd build +cmake .. +make +``` diff --git a/src/main/resources/items/items_template.xml b/src/main/resources/items/items_template.xml index 0810f45..19c9264 100644 --- a/src/main/resources/items/items_template.xml +++ b/src/main/resources/items/items_template.xml @@ -4,7 +4,7 @@ Available item types: - weapon - medicine - food ---!> +--> @@ -12,28 +12,31 @@ Available item types: + - + - + Wizard + - + - + + @@ -44,6 +47,7 @@ Available item types: <\item> + -- cgit v1.2.1