Skip to content

[sfgui] fix sfgui on macOS #9625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 1 commit into from
Jan 13, 2020
Merged

[sfgui] fix sfgui on macOS #9625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions ports/sfgui/001-fix-corefoundation-link.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" )
2 changes: 1 addition & 1 deletion ports/sfgui/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions ports/sfgui/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down