Add keybind to swap items between hands

[minetest.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0d0602496846597dcef48e3ff61a4e083ed8f0c..c481ae3198ba2d2e0f2911aab485288fb9209cee 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,7 +127,7 @@ if(BUILD_CLIENT AND TARGET IrrlichtMt::IrrlichtMt)
        endif()
        message(STATUS "Found IrrlichtMt ${IrrlichtMt_VERSION}")
 
-       set(TARGET_VER_S 1.9.0mt8)
+       set(TARGET_VER_S 1.9.0mt10)
        string(REPLACE "mt" "." TARGET_VER ${TARGET_VER_S})
        if(IrrlichtMt_VERSION VERSION_LESS ${TARGET_VER})
                message(FATAL_ERROR "At least IrrlichtMt ${TARGET_VER_S} is required to build")
@@ -249,8 +249,13 @@ endif()
 
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game" DESTINATION "${SHAREDIR}/games/"
        COMPONENT "SUBGAME_MINETEST_GAME" OPTIONAL PATTERN ".git*" EXCLUDE )
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/devtest" DESTINATION "${SHAREDIR}/games/"
-       COMPONENT "SUBGAME_MINIMAL" OPTIONAL PATTERN ".git*" EXCLUDE )
+
+set(INSTALL_DEVTEST FALSE CACHE BOOL "Install Development Test")
+
+if(INSTALL_DEVTEST)
+       install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/devtest" DESTINATION "${SHAREDIR}/games/"
+               PATTERN ".git*" EXCLUDE )
+endif()
 
 if(BUILD_CLIENT)
        install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client/shaders" DESTINATION "${SHAREDIR}/client")
@@ -322,13 +327,6 @@ cpack_add_component(SUBGAME_MINETEST_GAME
        GROUP "Games"
 )
 
-cpack_add_component(SUBGAME_MINIMAL
-       DISPLAY_NAME "Development Test"
-       DESCRIPTION "A basic testing environment used for engine development and sometimes for testing mods."
-       DISABLED #DISABLED does not mean it is disabled, and is just not selected by default.
-       GROUP "Games"
-)
-
 cpack_add_component_group(Subgames
        DESCRIPTION "Games for the Minetest engine."
 )