X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=CMakeLists.txt;h=aa1028d64d869b1efb61341377dbf72a37e96cd9;hb=a76f95464d00854d7b549154b274d8c83202d02b;hp=d3d230ffc2e21681cb281bd683a8e3ea3be77a61;hpb=f7ec4500c417377b467509679011d64a047f17d7;p=xonotic%2Fnetradiant.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d3d230ff..aa1028d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ -cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") - project(NetRadiant C CXX) -option(BUILD_RADIANT "Build the gui" ON) + +option(BUILD_RADIANT "Build the GUI" ON) if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/install" CACHE PATH "..." FORCE) @@ -44,17 +44,19 @@ message(STATUS "Building ${PROJECT_NAME} ${RADIANT_VERSION_STRING} ${RADIANT_ABO set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) -# For some reason the above flags don't really work... -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX) - include(CheckCXXCompilerFlag) - check_cxx_compiler_flag(--std=c++${CMAKE_CXX_STANDARD} STD_CXX) - if (STD_CXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++${CMAKE_CXX_STANDARD}") +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) + check_cxx_compiler_flag(--std=c++${CMAKE_CXX_STANDARD} STD_CXX) + if (STD_CXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++${CMAKE_CXX_STANDARD}") + else () + message(SEND_ERROR "Requires C++${CMAKE_CXX_STANDARD} or better") + endif () else () - message(SEND_ERROR "Requires C++${CMAKE_CXX_STANDARD} or better") + message(WARNING "Unrecognized compiler: ${CMAKE_CXX_COMPILER_ID}, make sure it supports C++${CMAKE_CXX_STANDARD}") endif () -else () - message(WARNING "Unrecognized compiler: ${CMAKE_CXX_COMPILER_ID}, make sure it supports C++${CMAKE_CXX_STANDARD}") endif () #----------------------------------------------------------------------- @@ -62,15 +64,36 @@ endif () #----------------------------------------------------------------------- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") -macro(addflags args) +macro(addflags_c args) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${args}") +endmacro() +macro(addflags_cxx args) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${args}") endmacro() +macro(addflags args) + addflags_c("${args}") + addflags_cxx("${args}") +endmacro() addflags("-fno-strict-aliasing") if (NOT WIN32) addflags("-fvisibility=hidden") endif () +if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + addflags("-Werror") + addflags("-pedantic-errors") +endif () + +addflags("-Wall") +addflags("-Wextra") +addflags("-pedantic") + +addflags_c("-Wno-deprecated-declarations") # vfs.c: g_strdown + +addflags("-Wno-unused-function") +addflags("-Wno-unused-variable") +addflags("-Wno-unused-parameter") + set(CMAKE_POSITION_INDEPENDENT_CODE 1) set(GTK_TARGET 2 CACHE STRING "GTK target") add_definitions(-DGTK_TARGET=${GTK_TARGET}) @@ -90,18 +113,19 @@ if (NOT CMAKE_BUILD_TYPE MATCHES Release) add_definitions(-D_DEBUG=1) endif () -add_definitions( - -DGTK_DISABLE_SINGLE_INCLUDES - -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES - -DGSEAL_ENABLE -) +macro(disable_deprecated name gtk2only) + add_definitions(-D${name}_DISABLE_SINGLE_INCLUDES) + if ((${gtk2only} EQUAL 0) OR (GTK_TARGET EQUAL 2)) + add_definitions(-D${name}_DISABLE_DEPRECATED) + endif () +endmacro() -if (GTK_TARGET EQUAL 2) - add_definitions( - -DGTK_DISABLE_DEPRECATED - -DGDK_DISABLE_DEPRECATED - ) -endif () +disable_deprecated(ATK 0) +disable_deprecated(G 0) +disable_deprecated(GDK 0) +disable_deprecated(GDK_PIXBUF 0) +disable_deprecated(GTK 1) +disable_deprecated(PANGO 0) if (APPLE) option(XWINDOWS "Build against X11" ON) @@ -194,15 +218,14 @@ macro(radiant_tool name) COMMAND ln -f -s "$" "${PROJECT_BINARY_DIR}/${name}.${RADIANT_EXECUTABLE}" VERBATIM ) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${name}${CMAKE_EXECUTABLE_SUFFIX} \ - ${CMAKE_INSTALL_PREFIX}/${name}.${RADIANT_EXECUTABLE} \ - )") + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink + ${name}${CMAKE_EXECUTABLE_SUFFIX} ${CMAKE_INSTALL_PREFIX}/${name}.${RADIANT_EXECUTABLE}) + ") endif () endmacro() if (BUILD_RADIANT) - add_subdirectory(radiant build) + add_subdirectory(radiant _radiant) set_target_properties(radiant PROPERTIES COMPILE_DEFINITIONS RADIANT_EXECUTABLE="${RADIANT_EXECUTABLE}" ) @@ -227,13 +250,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 () #----------------------------------------------------------------------- @@ -245,14 +279,14 @@ install( "${PROJECT_BINARY_DIR}/RADIANT_MAJOR" "${PROJECT_BINARY_DIR}/RADIANT_MINOR" "${PROJECT_BINARY_DIR}/RADIANT_PATCH" - DESTINATION ${CMAKE_INSTALL_PREFIX} + DESTINATION . ) install( DIRECTORY - ${PROJECT_SOURCE_DIR}/setup/data/tools/ - ${PROJECT_SOURCE_DIR}/docs - DESTINATION ${CMAKE_INSTALL_PREFIX} + setup/data/tools/ + docs + DESTINATION . ) set(GAME_FILES @@ -282,6 +316,8 @@ set(GAME_FILES ${_tmp}) install( DIRECTORY ${GAME_FILES} - DESTINATION ${CMAKE_INSTALL_PREFIX} + DESTINATION . OPTIONAL ) + +include(cmake/scripts/package.cmake)