diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-08-07 23:47:59 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-08-08 04:00:50 -0700 |
| commit | 67da15682a86b62abd07ebc095bb0eddb5123b0f (patch) | |
| tree | ee37e04615803e739d24f8b45d4970ad0ebae09e /ports | |
| parent | ad2bcd9dade618f3e97b6b8a362c6988cca5e534 (diff) | |
| download | vcpkg-67da15682a86b62abd07ebc095bb0eddb5123b0f.tar.gz vcpkg-67da15682a86b62abd07ebc095bb0eddb5123b0f.zip | |
[sfml] Fix using release freetype in debug mode
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/sfml/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sfml/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/sfml/use-system-freetype.patch | 13 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index 00817f1af..ed3580b4b 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -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
diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 2773ec215..edf9de148 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -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")
diff --git a/ports/sfml/use-system-freetype.patch b/ports/sfml/use-system-freetype.patch new file mode 100644 index 000000000..c58fc1b95 --- /dev/null +++ b/ports/sfml/use-system-freetype.patch @@ -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")
|