diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-05-21 16:16:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 01:16:33 -0700 |
| commit | eb891c23ef4048ec6ffa4b48c27ccdc4ddc8da29 (patch) | |
| tree | a8cff36ccbb1cfa54502d2ff71cca95814e53555 /ports/fltk/fix-system-link.patch | |
| parent | 8e820ffb197b2a9f00f3573e119af0f1f741892b (diff) | |
| download | vcpkg-eb891c23ef4048ec6ffa4b48c27ccdc4ddc8da29.tar.gz vcpkg-eb891c23ef4048ec6ffa4b48c27ccdc4ddc8da29.zip | |
[fltk] Update to 1.3.6 rc1 and fix osx build (#17586)
* [fltk] Update to 1.3.6 rc1
* [fltk] Fix osx build failure
* update patch
* update version record
Diffstat (limited to 'ports/fltk/fix-system-link.patch')
| -rw-r--r-- | ports/fltk/fix-system-link.patch | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/ports/fltk/fix-system-link.patch b/ports/fltk/fix-system-link.patch index 539a38976..45a4c3521 100644 --- a/ports/fltk/fix-system-link.patch +++ b/ports/fltk/fix-system-link.patch @@ -1,18 +1,16 @@ -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 0c2586f..eb77510 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -37,6 +37,13 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) - add_library(${LIBRARY_NAME} ${LIBTYPE} ${LIBFILES}) - - target_include_directories(${LIBRARY_NAME} PUBLIC $<INSTALL_INTERFACE:include>) -+ +diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake +index 6fa2fc5..e5ba493 100644 +--- a/CMake/fl_add_library.cmake ++++ b/CMake/fl_add_library.cmake +@@ -38,6 +38,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) + add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES}) + + target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>) ++ + if (APPLE) + find_library(Cocoa Cocoa) -+ target_link_libraries(${LIBRARY_NAME} PUBLIC $<$<PLATFORM_ID:Darwin>:${Cocoa}>) -+ elseif (WIN32) -+ target_link_libraries(${LIBRARY_NAME} PUBLIC gdi32 gdiplus user32 advapi32 ole32 shell32 comdlg32) ++ target_link_libraries(${TARGET_NAME} $<$<PLATFORM_ID:Darwin>:${Cocoa}>) + endif() - set_target_properties(${LIBRARY_NAME} - PROPERTIES + # target properties for all libraries + |