diff options
author | Sandy Carter | 2021-01-30 22:21:02 -0500 |
---|---|---|
committer | Sandy Carter | 2021-01-30 22:38:32 -0500 |
commit | 37c473ca9d30ba9e7d463a58365bb65ee416b2ee (patch) | |
tree | 85cfea0a6cbeef96b16a1e271179b552c25d5a96 /0001-cmake-turn-on-CMAKE_POSITION_INDEPENDENT_CODE-for-sh.patch | |
parent | 81f63187a78dcd5b975050a9a4effb18c0219e1e (diff) | |
download | aur-37c473ca9d30ba9e7d463a58365bb65ee416b2ee.tar.gz |
convert to cmake package using bgfx.cmake
Diffstat (limited to '0001-cmake-turn-on-CMAKE_POSITION_INDEPENDENT_CODE-for-sh.patch')
-rw-r--r-- | 0001-cmake-turn-on-CMAKE_POSITION_INDEPENDENT_CODE-for-sh.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/0001-cmake-turn-on-CMAKE_POSITION_INDEPENDENT_CODE-for-sh.patch b/0001-cmake-turn-on-CMAKE_POSITION_INDEPENDENT_CODE-for-sh.patch new file mode 100644 index 000000000000..34aab28d60d1 --- /dev/null +++ b/0001-cmake-turn-on-CMAKE_POSITION_INDEPENDENT_CODE-for-sh.patch @@ -0,0 +1,28 @@ +From db7e9cb07341043ac9949012d9e1a978fa7c8508 Mon Sep 17 00:00:00 2001 +From: Sandy Carter <bwrsandman@gmail.com> +Date: Sat, 30 Jan 2021 19:33:13 -0500 +Subject: [PATCH 1/4] cmake: turn on CMAKE_POSITION_INDEPENDENT_CODE for shared + +This prevents an error while linking libbx.a into libbgfx.so on linux +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52a7315..4412be1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,10 @@ set( BGFX_LIBRARY_TYPE "STATIC" CACHE STRING "Linking type for library" ) + + set_property( CACHE BGFX_LIBRARY_TYPE PROPERTY STRINGS STATIC SHARED ) + ++if( BGFX_LIBRARY_TYPE MATCHES "SHARED" ) ++ set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++endif() ++ + if( NOT BX_DIR ) + set( BX_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bx" CACHE STRING "Location of bx." ) + elseif( NOT IS_ABSOLUTE "${BX_DIR}") +-- +2.30.0 + |