diff options
| -rw-r--r-- | .github/workflows/macos.yml | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | README.md | 1 |
3 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index edc6630c0..ba5a2d91e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -46,7 +46,8 @@ jobs: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \ -DCMAKE_FIND_FRAMEWORK=LAST \ -DCMAKE_INSTALL_PREFIX=../build/macos/ \ - -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE + -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE \ + -DINSTALL_DEVTEST=TRUE make -j2 make install diff --git a/CMakeLists.txt b/CMakeLists.txt index 41d5c8707..8959f6129 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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." ) @@ -262,6 +262,7 @@ General options and their default values: ENABLE_SYSTEM_JSONCPP=ON - Use JsonCPP from system RUN_IN_PLACE=FALSE - Create a portable install (worlds, settings etc. in current directory) ENABLE_UPDATE_CHECKER=TRUE - Whether to enable update checks by default + INSTALL_DEVTEST=FALSE - Whether the Development Test game should be installed alongside Minetest USE_GPROF=FALSE - Enable profiling using GProf VERSION_EXTRA= - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar) ENABLE_TOUCH=FALSE - Enable Touchscreen support (requires support by IrrlichtMt) |