[sfgui] Fix on macOS (#9625)

This commit is contained in:
nicole mazzuca 2020-01-13 13:37:40 -08:00 committed by Victor Romero
parent 0d54d33f18
commit 649e830d9f
3 changed files with 26 additions and 1 deletions

View File

@ -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" )

View File

@ -1,5 +1,5 @@
Source: sfgui Source: sfgui
Version: 0.4.0-2 Version: 0.4.0-3
Homepage: https://github.com/TankOs/SFGUI Homepage: https://github.com/TankOs/SFGUI
Description: simple and fast graphical user interface library Description: simple and fast graphical user interface library
Build-Depends: sfml Build-Depends: sfml

View File

@ -6,6 +6,8 @@ vcpkg_from_github(
REF 0.4.0 REF 0.4.0
SHA512 15456c6080b7095bcdcec08489b2b91b5cfc36cdf3c0b645b305072e7e835837eb4f95b59371ff176630b2b7ae51da475d8ea0bde5ff7fc0ba74c463bf5f54cf SHA512 15456c6080b7095bcdcec08489b2b91b5cfc36cdf3c0b645b305072e7e835837eb4f95b59371ff176630b2b7ae51da475d8ea0bde5ff7fc0ba74c463bf5f54cf
HEAD_REF master HEAD_REF master
PATCHES
"001-fix-corefoundation-link.patch"
) )
file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake) file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake)