cmake: Remove SDL_net-related checks and substitutions
This commit is contained in:
Ignacio R. Morelle
parent
99e114ab17
commit
8b341411d6
3 changed files with 0 additions and 139 deletions
|
|
@ -572,9 +572,6 @@ if(ENABLE_GAME OR ENABLE_TESTS)
|
||||||
endif(NOT MSVC)
|
endif(NOT MSVC)
|
||||||
|
|
||||||
endif(ENABLE_GAME OR ENABLE_TESTS)
|
endif(ENABLE_GAME OR ENABLE_TESTS)
|
||||||
if(ENABLE_GAME OR ENABLE_SERVER OR ENABLE_CAMPAIGN_SERVER OR ENABLE_TESTS)
|
|
||||||
find_package( SDL2_net 2.0.0 REQUIRED )
|
|
||||||
endif(ENABLE_GAME OR ENABLE_SERVER OR ENABLE_CAMPAIGN_SERVER OR ENABLE_TESTS)
|
|
||||||
if(ENABLE_TOOLS)
|
if(ENABLE_TOOLS)
|
||||||
find_package( ZLIB REQUIRED )
|
find_package( ZLIB REQUIRED )
|
||||||
find_package( PNG REQUIRED )
|
find_package( PNG REQUIRED )
|
||||||
|
|
|
||||||
|
|
@ -1,130 +0,0 @@
|
||||||
#.rst:
|
|
||||||
# FindSDL2_net
|
|
||||||
# -----------
|
|
||||||
#
|
|
||||||
# Locate SDL2_net library
|
|
||||||
#
|
|
||||||
# This module defines:
|
|
||||||
#
|
|
||||||
# ::
|
|
||||||
#
|
|
||||||
# SDL2_NET_LIBRARIES, the name of the library to link against
|
|
||||||
# SDL2_NET_INCLUDE_DIRS, where to find the headers
|
|
||||||
# SDL2_NET_FOUND, if false, do not try to link against
|
|
||||||
# SDL2_NET_VERSION_STRING - human-readable string containing the version of SDL2_net
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# For backward compatiblity the following variables are also set:
|
|
||||||
#
|
|
||||||
# ::
|
|
||||||
#
|
|
||||||
# SDL2NET_LIBRARY (same value as SDL2_NET_LIBRARIES)
|
|
||||||
# SDL2NET_INCLUDE_DIR (same value as SDL2_NET_INCLUDE_DIRS)
|
|
||||||
# SDL2NET_FOUND (same value as SDL2_NET_FOUND)
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# $SDL2DIR is an environment variable that would correspond to the
|
|
||||||
# ./configure --prefix=$SDL2DIR used in building SDL2.
|
|
||||||
#
|
|
||||||
# Created by Andreas Löf. This was influenced by the FindSDL_net.cmake
|
|
||||||
# module, but with modifications to use SDL2.
|
|
||||||
#
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2005-2009 Kitware, Inc.
|
|
||||||
# Copyright 2012 Benjamin Eikel
|
|
||||||
# Copyright 2015 Andreas Löf
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions
|
|
||||||
# are met:
|
|
||||||
#
|
|
||||||
# * Redistributions of source code must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
#
|
|
||||||
# * Redistributions in binary form must reproduce the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer in the
|
|
||||||
# documentation and/or other materials provided with the distribution.
|
|
||||||
#
|
|
||||||
# * Neither the names of Kitware, Inc., the Insight Software Consortium,
|
|
||||||
# nor the names of their contributors may be used to endorse or promote
|
|
||||||
# products derived from this software without specific prior written
|
|
||||||
# permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
||||||
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
#
|
|
||||||
#=============================================================================
|
|
||||||
|
|
||||||
if(NOT SDL2_NET_INCLUDE_DIR AND SDL2NET_INCLUDE_DIR)
|
|
||||||
set(SDL2_NET_INCLUDE_DIR ${SDL2NET_INCLUDE_DIR} CACHE PATH "directory cache
|
|
||||||
entry initialized from old variable name")
|
|
||||||
endif()
|
|
||||||
find_path(SDL2_NET_INCLUDE_DIR SDL_net.h
|
|
||||||
HINTS
|
|
||||||
ENV SDL2NETDIR
|
|
||||||
ENV SDL2DIR
|
|
||||||
PATH_SUFFIXES SDL2
|
|
||||||
# path suffixes to search inside ENV{SDL2DIR}
|
|
||||||
include/SDL2
|
|
||||||
)
|
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
||||||
set(VC_LIB_PATH_SUFFIX lib/x64)
|
|
||||||
else()
|
|
||||||
set(VC_LIB_PATH_SUFFIX lib/x86)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT SDL2_NET_LIBRARY AND SDL2NET_LIBRARY)
|
|
||||||
set(SDL2_NET_LIBRARY ${SDL2NET_LIBRARY} CACHE FILEPATH "file cache entry
|
|
||||||
initialized from old variable name")
|
|
||||||
endif()
|
|
||||||
find_library(SDL2_NET_LIBRARY
|
|
||||||
NAMES SDL2_net
|
|
||||||
HINTS
|
|
||||||
ENV SDL2NETDIR
|
|
||||||
ENV SDL2DIR
|
|
||||||
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
|
|
||||||
)
|
|
||||||
|
|
||||||
if(SDL2_NET_INCLUDE_DIR AND EXISTS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h")
|
|
||||||
file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL_NET_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_NET_MAJOR_VERSION[ \t]+[0-9]+$")
|
|
||||||
file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL_NET_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_NET_MINOR_VERSION[ \t]+[0-9]+$")
|
|
||||||
file(STRINGS "${SDL2_NET_INCLUDE_DIR}/SDL_net.h" SDL_NET_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_NET_PATCHLEVEL[ \t]+[0-9]+$")
|
|
||||||
string(REGEX REPLACE "^#define[ \t]+SDL_NET_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_NET_VERSION_MAJOR "${SDL_NET_VERSION_MAJOR_LINE}")
|
|
||||||
string(REGEX REPLACE "^#define[ \t]+SDL_NET_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_NET_VERSION_MINOR "${SDL_NET_VERSION_MINOR_LINE}")
|
|
||||||
string(REGEX REPLACE "^#define[ \t]+SDL_NET_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL_NET_VERSION_PATCH "${SDL_NET_VERSION_PATCH_LINE}")
|
|
||||||
set(SDL2_NET_VERSION_STRING ${SDL_NET_VERSION_MAJOR}.${SDL_NET_VERSION_MINOR}.${SDL_NET_VERSION_PATCH})
|
|
||||||
unset(SDL_NET_VERSION_MAJOR_LINE)
|
|
||||||
unset(SDL_NET_VERSION_MINOR_LINE)
|
|
||||||
unset(SDL_NET_VERSION_PATCH_LINE)
|
|
||||||
unset(SDL_NET_VERSION_MAJOR)
|
|
||||||
unset(SDL_NET_VERSION_MINOR)
|
|
||||||
unset(SDL_NET_VERSION_PATCH)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(SDL2_NET_LIBRARIES ${SDL2_NET_LIBRARY})
|
|
||||||
set(SDL2_NET_INCLUDE_DIRS ${SDL2_NET_INCLUDE_DIR})
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_net
|
|
||||||
REQUIRED_VARS SDL2_NET_LIBRARIES SDL2_NET_INCLUDE_DIRS
|
|
||||||
VERSION_VAR SDL2_NET_VERSION_STRING)
|
|
||||||
|
|
||||||
# for backward compatiblity
|
|
||||||
set(SDL2NET_LIBRARY ${SDL2_NET_LIBRARIES})
|
|
||||||
set(SDL2NET_INCLUDE_DIR ${SDL2_NET_INCLUDE_DIRS})
|
|
||||||
set(SDL2NET_FOUND ${SDL2_NET_FOUND})
|
|
||||||
|
|
||||||
mark_as_advanced(SDL2_NET_LIBRARY SDL2_NET_INCLUDE_DIR)
|
|
||||||
|
|
@ -34,10 +34,6 @@ if(SDL2MIXER_INCLUDE_DIR)
|
||||||
include_directories(SYSTEM ${SDL2MIXER_INCLUDE_DIR} )
|
include_directories(SYSTEM ${SDL2MIXER_INCLUDE_DIR} )
|
||||||
set(sdl_mixer-lib ${SDL2_MIXER_LIBRARY})
|
set(sdl_mixer-lib ${SDL2_MIXER_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
if(SDL2NET_INCLUDE_DIR)
|
|
||||||
include_directories(SYSTEM ${SDL2NET_INCLUDE_DIR} )
|
|
||||||
set(sdl_net-lib ${SDL2_NET_LIBRARY})
|
|
||||||
endif()
|
|
||||||
if(SDL2TTF_INCLUDE_DIR)
|
if(SDL2TTF_INCLUDE_DIR)
|
||||||
include_directories(SYSTEM ${SDL2TTF_INCLUDE_DIR} )
|
include_directories(SYSTEM ${SDL2TTF_INCLUDE_DIR} )
|
||||||
set(sdl_ttf-lib ${SDL2_TTF_LIBRARY})
|
set(sdl_ttf-lib ${SDL2_TTF_LIBRARY})
|
||||||
|
|
@ -143,13 +139,11 @@ endif(MSVC)
|
||||||
|
|
||||||
set(server-external-libs
|
set(server-external-libs
|
||||||
${common-external-libs}
|
${common-external-libs}
|
||||||
${sdl_net-lib}
|
|
||||||
${Boost_SYSTEM_LIBRARIES}
|
${Boost_SYSTEM_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
set(game-external-libs
|
set(game-external-libs
|
||||||
${game-external-libs}
|
${game-external-libs}
|
||||||
${sdl_net-lib}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set(tools-external-libs
|
set(tools-external-libs
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue