casa-mp-base

From e6757089b465a041ea1a96252359f31afc2e323e Mon Sep 17 00:00:00 2001

From: Rafael Kitover <rkitover@gmail.com>

Date: Mon, 19 Dec 2016 13:16:07 -0800

Subject: [PATCH] packaging support improvements

​

This grew out of my work creating an sfml port for macports, but should

be helpful for package maintainers of various distributions:

​

* add an SFML_USE_SYSTEM_DEPS option to ignore everything in extlibs/

  except for headers/stb_image, and use the system versions

​

* install pkg-config files if a pkg-config program is found

  and either lib/pkgconfig or libdata/pkgconfig exists under the

  INSTALL_PREFIX, or the SFML_INSTALL_PKGCONFIG_FILES flag is set

  explicitly

​

* install pkg-config files for static libs too, add the necessary

  Requires.private and Libs.private entries to the .pc files to support

  static linking

​

* on OS X, honor all INSTALL_NAME and RPATH related cmake variables and

  only set the INSTALL_NAME_DIR to "@rpath" if none of them is set, this

  preserves the default behavior of using @rpath but also allows

  overriding by the usual cmake mechanisms

---

 CMakeLists.txt                       | 73 ++++++++++++++++++++++++------------

 cmake/Config.cmake                   | 13 +++++++

 cmake/Macros.cmake                   | 14 +++++--

 tools/pkg-config/sfml-audio.pc.in    |  3 ++

 tools/pkg-config/sfml-graphics.pc.in |  3 ++

 tools/pkg-config/sfml-window.pc.in   |  2 +

 6 files changed, 81 insertions(+), 27 deletions(-)

​

diff --git a/CMakeLists.txt b/CMakeLists.txt

index e7914ac..419d56d 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -16,6 +16,9 @@ sfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug

 # Suppress Cygwin legacy warning

 set(CMAKE_LEGACY_CYGWIN_WIN32 0)

+# Suppress Mac OS X RPATH warnings and adopt new related behaviors

+cmake_policy(SET CMP0042 NEW)

+

 # set Android specific options

 # define the minimum API level to be used

@@ -130,6 +133,39 @@ if(NOT BUILD_SHARED_LIBS)

     add_definitions(-DSFML_STATIC)

 endif()

+# allow not using bundled dependencies with a switch

+# (except for stb_image)

+# yes this is horrible, but GLOB_RECURSE sucks

+sfml_set_option(SFML_USE_SYSTEM_DEPS FALSE BOOL "TRUE to use system dependencies, FALSE to use the bundled ones.")

+if(SFML_USE_SYSTEM_DEPS)

+    if(SFML_INSTALL_XCODE_TEMPLATES)

+        message(FATAL_ERROR "XCode templates installation cannot be used with the SFML_USE_SYSTEM_DEPS option (the bundled frameworks are required.)")

+    endif()

+

+    file(GLOB_RECURSE DEP_LIBS    "${CMAKE_SOURCE_DIR}/extlibs/libs*/*")

+    file(GLOB_RECURSE DEP_BINS    "${CMAKE_SOURCE_DIR}/extlibs/bin*/*")

+    file(GLOB_RECURSE DEP_HEADERS "${CMAKE_SOURCE_DIR}/extlibs/headers/*")