X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=CMakeLists.txt;h=95fa439ffb73caffebf04c360fea956ffd201766;hb=37787ff58d17054395ece7e19db0bd07dde08fc6;hp=bbad9b9e67a70a0d52519baf86b899624a210350;hpb=9273c45f6899a22998839064d4f04f1ea66d5af9;p=xonotic%2Fnetradiant.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbad9b9e..95fa439f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ message(STATUS "Building ${PROJECT_NAME} ${RADIANT_VERSION_STRING} ${RADIANT_ABO
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 if (CMAKE_VERSION VERSION_LESS "3.1")
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
         include(CheckCXXCompilerFlag)
@@ -87,24 +88,11 @@ addflags("-Wall")
 addflags("-Wextra")
 addflags("-pedantic")
 
-addflags("-Wno-extra")
-addflags("-Wno-switch")
-addflags("-Wno-pedantic")
-addflags("-Wno-parentheses")
-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")
@@ -121,6 +109,9 @@ add_definitions(-DRADIANT_PATCH_VERSION="${NetRadiant_VERSION_PATCH}")
 
 add_definitions(-DRADIANT_ABOUTMSG="${NetRadiant_ABOUT}")
 
+add_definitions(-D_GLIBCXX_DEBUG=1)
+add_definitions(-D_GLIBCXX_DEBUG_PEDANTIC=1)
+
 if (NOT CMAKE_BUILD_TYPE MATCHES Release)
     add_definitions(-D_DEBUG=1)
 endif ()
@@ -262,13 +253,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 ()
 
 #-----------------------------------------------------------------------