diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-03-11 07:51:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 16:51:52 -0700 |
| commit | 7308c86e5b08abdb593b2eae0da5982ec7d8c4a9 (patch) | |
| tree | 280770ada6cfc7b4685cbd79c794ef949b087529 | |
| parent | 249b8555eb9e83ca40461f3f8f2c8a88b745d15f (diff) | |
| download | vcpkg-7308c86e5b08abdb593b2eae0da5982ec7d8c4a9.tar.gz vcpkg-7308c86e5b08abdb593b2eae0da5982ec7d8c4a9.zip | |
[fltk] Fix build error on Linux (#10018)
* [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
| -rw-r--r-- | ports/fltk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fltk/portfile.cmake | 25 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
3 files changed, 18 insertions, 11 deletions
diff --git a/ports/fltk/CONTROL b/ports/fltk/CONTROL index a029a5e85..c9d660cee 100644 --- a/ports/fltk/CONTROL +++ b/ports/fltk/CONTROL @@ -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 diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index bc3853857..905b140bb 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -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() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5872a33d6..95184407d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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
|