From 236afb3ee879b4a3094c45b0a660585460af3688 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Sat, 14 Oct 2017 04:06:45 +0200 Subject: [PATCH] fix game_packs_all target Previously, game_packs_all target was just calling game_packs target, so it was just installing free game packs, not all. It's now a proper target setting proper environment variables before calling install-gamepacks.sh. --- CMakeLists.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00e98145..6fb9b8e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,13 +249,18 @@ endif () #----------------------------------------------------------------------- option(DOWNLOAD_GAMEPACKS "Download game packs" ON) -add_custom_target(game_packs - COMMAND ${CMAKE_COMMAND} -E make_directory games - COMMAND DOWNLOAD_GAMEPACKS=yes SOURCE_DIR="${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/install-gamepacks.sh" "${PROJECT_BINARY_DIR}" - COMMENT "Downloading game packs" - ) if (DOWNLOAD_GAMEPACKS) - add_custom_target(game_packs_all ALL DEPENDS game_packs) + add_custom_target(game_packs + COMMAND ${CMAKE_COMMAND} -E make_directory games + COMMAND DOWNLOAD_GAMEPACKS=yes SOURCE_DIR="${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/install-gamepacks.sh" "${PROJECT_BINARY_DIR}" + COMMENT "Downloading free game packs" + ) + + add_custom_target(game_packs_all + COMMAND ${CMAKE_COMMAND} -E make_directory games + COMMAND DOWNLOAD_GAMEPACKS=all SOURCE_DIR="${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/install-gamepacks.sh" "${PROJECT_BINARY_DIR}" + COMMENT "Downloading all game packs" + ) endif () #----------------------------------------------------------------------- -- 2.39.2