From 7308c86e5b08abdb593b2eae0da5982ec7d8c4a9 Mon Sep 17 00:00:00 2001
From: Lily <47812810+LilyWangL@users.noreply.github.com>
Date: Wed, 11 Mar 2020 07:51:52 +0800
Subject: [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
---
 ports/fltk/CONTROL        |  2 +-
 ports/fltk/portfile.cmake | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'ports')

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()
-- 
cgit v1.2.3