X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=CMakeLists.txt;h=d2e87cd5858835c94574cf9d14ca3314a4772309;hp=db0a1caeb3820e71943db5f1f1f5bcb8570748f0;hb=f6b4543bd54926411cb71a776bc5b37eea846c4f;hpb=265c42d5a54ec436f9463e79e000b5a566a0b296;ds=sidebyside diff --git a/CMakeLists.txt b/CMakeLists.txt index db0a1cae..d2e87cd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,22 +87,11 @@ addflags("-Wall") addflags("-Wextra") addflags("-pedantic") -addflags("-Wno-parentheses") -addflags("-Wno-sign-compare") -addflags("-Wno-write-strings") +addflags_c("-Wno-deprecated-declarations") # vfs.c: g_strdown + addflags("-Wno-unused-function") addflags("-Wno-unused-variable") addflags("-Wno-unused-parameter") -addflags("-Wno-deprecated-declarations") -addflags("-Wno-unused-but-set-variable") -addflags("-Wno-missing-field-initializers") - -addflags_c("-Wno-int-conversion") -addflags_c("-Wno-pointer-to-int-cast") -addflags_c("-Wno-incompatible-pointer-types") - -addflags_cxx("-Wno-reorder") -addflags_cxx("-Wno-delete-non-virtual-dtor") set(CMAKE_POSITION_INDEPENDENT_CODE 1) set(GTK_TARGET 2 CACHE STRING "GTK target") @@ -260,13 +249,24 @@ endif () #----------------------------------------------------------------------- option(DOWNLOAD_GAMEPACKS "Download game packs" ON) -add_custom_target(game_packs +add_custom_target(game_packs_free 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" + 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" + ) + if (DOWNLOAD_GAMEPACKS) - add_custom_target(game_packs_all ALL DEPENDS game_packs) + set(DOWNLOAD_GAMEPACKS "all") +endif() +if ("${DOWNLOAD_GAMEPACKS}" STREQUAL "free") + add_custom_target(game_packs_go ALL DEPENDS game_packs_free) +elseif ("${DOWNLOAD_GAMEPACKS}" STREQUAL "all") + add_custom_target(game_packs_go ALL DEPENDS game_packs_all) endif () #-----------------------------------------------------------------------