mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 09:08:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[sfml] Fix using release freetype in debug mode

Browse Source
This commit is contained in:
Robert Schumacher 2018-08-07 23:47:59 -07:00
parent ad2bcd9dad
commit 67da15682a
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/sfml/CONTROL
View File

@ -1,4 +1,4 @@
Source: sfml
Version: 2.5.0-1
Version: 2.5.0-2
Description: Simple and fast multimedia library
Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb

5
ports/sfml/portfile.cmake
View File

@ -5,13 +5,16 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
REF 2.5.0
HEAD_REF master
SHA512 94306dcbed7d68bb7e226cd91e25950a07bcf393988c4bb79f9de3555c18c78cae4573e911235f712e711a7c02a614bf370df32b8d85240d2f08142327e05076
PATCHES "${CMAKE_CURRENT_LIST_DIR}/portfile.cmake"
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/use-system-freetype.patch"
)
file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs)
# Without this, we get error: list sub-command REMOVE_DUPLICATES requires list to be present.
file(MAKE_DIRECTORY ${SOURCE_PATH}/extlibs/libs)
file(WRITE ${SOURCE_PATH}/extlibs/libs/x "")
# The embedded FindFreetype doesn't properly handle debug libraries
file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake)
if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message("SFML currently requires the following libraries from the system package manager:\n libudev\n libx11\n libxrandr\n opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxi-dev libudev-dev mesa-common-dev")

13
ports/sfml/use-system-freetype.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/sfml/Graphics/CMakeLists.txt b/src/sfml/Graphics/CMakeLists.txt
index 883c758..76f3b6f 100644
--- a/src/sfml/Graphics/CMakeLists.txt
+++ b/src/sfml/Graphics/CMakeLists.txt
@@ -135,7 +135,7 @@ if(SFML_OS_ANDROID)
endif()
sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY")
-target_link_libraries(sfml-graphics PRIVATE Freetype)
+target_link_libraries(sfml-graphics PRIVATE Freetype::Freetype)
# add preprocessor symbols
target_compile_definitions(sfml-graphics PRIVATE "STBI_FAILURE_USERMSG")