From 37acadc2af29869689e27241e4781ebfc69470aa Mon Sep 17 00:00:00 2001 From: kwolekr Date: Wed, 3 Apr 2013 16:36:25 -0400 Subject: Bump version to 0.4.6 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bbe6454a..7175858be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing set(VERSION_MAJOR 0) set(VERSION_MINOR 4) -set(VERSION_PATCH 5) +set(VERSION_PATCH 6) if(VERSION_EXTRA) set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA}) endif() -- cgit v1.2.3 From 1a5dcfd0c879ab5315b35de49ded26b93f83b45e Mon Sep 17 00:00:00 2001 From: Diego Martínez Date: Fri, 5 Apr 2013 02:49:19 -0300 Subject: Install "build" and "survival" games with "make install" --- CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7175858be..ff44e9c26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,6 +144,18 @@ if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE}) install(FILES ${MINETEST_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/minetest_game/") install(DIRECTORY ${MINETEST_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/minetest_game") endif() +set(MINETEST_BUILD_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/build") +if(EXISTS ${MINETEST_BUILD_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_BUILD_GAME_SOURCE}) + install(FILES ${MINETEST_BUILD_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/build/") + install(FILES ${MINETEST_BUILD_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/build/") + install(DIRECTORY ${MINETEST_BUILD_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/build") +endif() +set(MINETEST_SURVIVAL_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/survival") +if(EXISTS ${MINETEST_SURVIVAL_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_SURVIVAL_GAME_SOURCE}) + install(FILES ${MINETEST_SURVIVAL_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/survival/") + install(FILES ${MINETEST_SURVIVAL_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/survival/") + install(DIRECTORY ${MINETEST_SURVIVAL_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/survival") +endif() if(BUILD_CLIENT) #install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base") -- cgit v1.2.3 From 046534e14bf95d7154b4c4217811de64dee1f8f6 Mon Sep 17 00:00:00 2001 From: Diego Martínez Date: Fri, 5 Apr 2013 12:34:43 -0300 Subject: Fix to be able to build from dir different than source dir --- CMakeLists.txt | 19 ++++++++++++------- src/CMakeLists.txt | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ff44e9c26..124e68ddd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,15 +167,20 @@ endif() install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}") -install(FILES "README.txt" DESTINATION "${DOCDIR}") -install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}") -install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}") -install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.txt" DESTINATION "${DOCDIR}") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/lua_api.txt" DESTINATION "${DOCDIR}") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/mapformat.txt" DESTINATION "${DOCDIR}") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") if(UNIX) - install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6") - install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}") - install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") + install(FILES + "${CMAKE_CURRENT_SOURCE_DIR}/doc/minetest.6" + "${CMAKE_CURRENT_SOURCE_DIR}/doc/minetestserver.6" + DESTINATION "${MANDIR}/man6") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest.desktop" + DESTINATION "${XDG_APPS_DIR}") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.svg" + DESTINATION "${ICONDIR}/hicolor/scalable/apps") endif() # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ed1c862f..b951a8261 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -371,7 +371,7 @@ if(USE_CURL) ) endif(USE_CURL) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/bin") if(BUILD_CLIENT) add_executable(${PROJECT_NAME} ${minetest_SRCS}) -- cgit v1.2.3 From fbf76184f0b8ec715255ed1246e49b575fc84873 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 7 Apr 2013 01:30:06 -0400 Subject: Revert "Fix to be able to build from dir different than source dir" This commit broke RUN_IN_PLACE --- CMakeLists.txt | 19 +++++++------------ src/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 124e68ddd..ff44e9c26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,20 +167,15 @@ endif() install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.txt" DESTINATION "${DOCDIR}") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/lua_api.txt" DESTINATION "${DOCDIR}") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/mapformat.txt" DESTINATION "${DOCDIR}") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") +install(FILES "README.txt" DESTINATION "${DOCDIR}") +install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}") +install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}") +install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") if(UNIX) - install(FILES - "${CMAKE_CURRENT_SOURCE_DIR}/doc/minetest.6" - "${CMAKE_CURRENT_SOURCE_DIR}/doc/minetestserver.6" - DESTINATION "${MANDIR}/man6") - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest.desktop" - DESTINATION "${XDG_APPS_DIR}") - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.svg" - DESTINATION "${ICONDIR}/hicolor/scalable/apps") + install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6") + install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}") + install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") endif() # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f2d7439a0..9bef3289e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -372,7 +372,7 @@ if(USE_CURL) ) endif(USE_CURL) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/bin") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") if(BUILD_CLIENT) add_executable(${PROJECT_NAME} ${minetest_SRCS}) -- cgit v1.2.3