aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-01-13 13:37:40 -0800
committerVictor Romero <romerosanchezv@gmail.com>2020-01-13 13:37:40 -0800
commit649e830d9fad35f10fbfab2c86776283a5a8434f (patch)
treeef52af4ca3af4a207263211e3741064aa17778ae
parent0d54d33f18342607c8d8a7514888e3cf8c15916e (diff)
downloadvcpkg-649e830d9fad35f10fbfab2c86776283a5a8434f.tar.gz
vcpkg-649e830d9fad35f10fbfab2c86776283a5a8434f.zip
[sfgui] Fix on macOS (#9625)
-rw-r--r--ports/sfgui/001-fix-corefoundation-link.patch23
-rw-r--r--ports/sfgui/CONTROL2
-rw-r--r--ports/sfgui/portfile.cmake2
3 files changed, 26 insertions, 1 deletions
diff --git a/ports/sfgui/001-fix-corefoundation-link.patch b/ports/sfgui/001-fix-corefoundation-link.patch
new file mode 100644
index 000000000..e3c80bcf3
--- /dev/null
+++ b/ports/sfgui/001-fix-corefoundation-link.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0af720..774e2d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,16 +107,8 @@ if( WIN32 )
+ set( LIB_PATH "lib" )
+ elseif( APPLE )
+ find_library( COREFOUNDATION_LIBRARY CoreFoundation )
+- mark_as_advanced( COREFOUNDATION_LIBRARY )
+-
+- add_library( CoreFoundation SHARED IMPORTED )
+- set_target_properties(
+- CoreFoundation PROPERTIES
+- IMPORTED_LOCATION "${COREFOUNDATION_LIBRARY}"
+- INTERFACE_INCLUDE_DIRECTORIES "/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- )
+-
+- target_link_libraries( ${TARGET} PUBLIC CoreFoundation )
++
++ target_link_libraries( ${TARGET} PUBLIC ${COREFOUNDATION_LIBRARY} )
+ set( SHARE_PATH "${CMAKE_INSTALL_PREFIX}/share/SFGUI" )
+ set( LIB_PATH "lib" )
+ elseif( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux" )
diff --git a/ports/sfgui/CONTROL b/ports/sfgui/CONTROL
index 944b8df2c..b53bac2af 100644
--- a/ports/sfgui/CONTROL
+++ b/ports/sfgui/CONTROL
@@ -1,5 +1,5 @@
Source: sfgui
-Version: 0.4.0-2
+Version: 0.4.0-3
Homepage: https://github.com/TankOs/SFGUI
Description: simple and fast graphical user interface library
Build-Depends: sfml
diff --git a/ports/sfgui/portfile.cmake b/ports/sfgui/portfile.cmake
index 9ab01a19e..3e1fada8e 100644
--- a/ports/sfgui/portfile.cmake
+++ b/ports/sfgui/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
REF 0.4.0
SHA512 15456c6080b7095bcdcec08489b2b91b5cfc36cdf3c0b645b305072e7e835837eb4f95b59371ff176630b2b7ae51da475d8ea0bde5ff7fc0ba74c463bf5f54cf
HEAD_REF master
+ PATCHES
+ "001-fix-corefoundation-link.patch"
)
file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake)