mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 03:13:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[fltk] Fix build error on Linux (#10018)

Browse Source 
* [fltk] Fix build error on Linux

* [fltk] Modify ci.baseline.txt

* [fltk] Fix build error

* [fltk] Fix build error

* [fltk] Fix build error

* [fltk] Fix build error on MACOS
This commit is contained in:
Lily 2020-03-11 07:51:52 +08:00 committed by GitHub
parent 249b8555eb
commit 7308c86e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/fltk/CONTROL
View File

@ -1,5 +1,5 @@
Source: fltk
Version: 1.3.5-1
Version: 1.3.5-2
Homepage: https://www.fltk.org/
Description: FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.
Build-Depends: zlib, libpng, libjpeg-turbo

25
ports/fltk/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
URLS "https://fltk.org/pub/fltk/1.3.5/fltk-1.3.5-source.tar.gz"
FILENAME "fltk-1.3.5.tar.gz"
@ -42,17 +40,28 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
if (VCPKG_TARGET_IS_LINUX)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT} TARGET_PATH share/${PORT})
file(COPY ${CURRENT_PACKAGES_DIR}/bin/fluid DESTINATION ${CURRENT_PACKAGES_DIR}/tools/fltk)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluid)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluid)
elseif (VCPKG_TARGET_IS_OSX)
file(COPY ${CURRENT_PACKAGES_DIR}/bin/fluid.app DESTINATION ${CURRENT_PACKAGES_DIR}/tools/fltk)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluid.app)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluid.app)
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
file(COPY ${CURRENT_PACKAGES_DIR}/bin/fluid.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/fltk)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluid.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluid.exe)
endif()
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/CMAKE
${CURRENT_PACKAGES_DIR}/debug/CMAKE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share
)
file(COPY ${CURRENT_PACKAGES_DIR}/bin/fluid.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/fltk)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluid.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fltk-config)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluid.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config)
vcpkg_copy_pdbs()

2
scripts/ci.baseline.txt
View File

@ -453,8 +453,6 @@ fizz:x64-windows-static=fail
flint:x64-linux=fail
flint:x64-osx=fail
fltk:arm-uwp=fail
fltk:x64-linux=fail
fltk:x64-osx=fail
fltk:x64-uwp=fail
fluidsynth:x64-linux=fail
fluidsynth:x64-osx=fail