From 98ae960b4b3d41ed8a82efb76b05ba183e2228bf Mon Sep 17 00:00:00 2001
From: Sean Warren <s.warren@garvan.org.au>
Date: Wed, 27 Mar 2019 04:46:40 +1100
Subject: Add Qt5 static missing dependencies, fix mac packages (#5680)

* [qt5-macextras] Add qt5-macextras port

* [cutelyst2] Fix install on mac

* [qt5-purchasing] Add missing dependency on qt5-declarative

* [qt5] Ensure we link to required libraries for qt5 static build

* [qscintilla] Fix install on mac

* [libqglviewer] Fix install paths on mac

* [libqglviewer] Fix regressions

* [qscintilla] Fix regressions

* Bump version numbers

* [qt5] restore harfbuzz on osx
---
 ports/libqglviewer/CONTROL        |  2 +-
 ports/libqglviewer/portfile.cmake | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'ports/libqglviewer')

diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL
index 7112016f5..c9e66ef18 100644
--- a/ports/libqglviewer/CONTROL
+++ b/ports/libqglviewer/CONTROL
@@ -1,4 +1,4 @@
 Source: libqglviewer
-Version: 2.7.1
+Version: 2.7.1-1
 Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.
 Build-Depends: qt5-base
diff --git a/ports/libqglviewer/portfile.cmake b/ports/libqglviewer/portfile.cmake
index 52fb41ed4..f57092521 100644
--- a/ports/libqglviewer/portfile.cmake
+++ b/ports/libqglviewer/portfile.cmake
@@ -14,9 +14,19 @@ vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro)
 vcpkg_build_qmake()
 
 file(INSTALL ${SOURCE_PATH}/QGLViewer DESTINATION ${CURRENT_PACKAGES_DIR}/include  FILES_MATCHING  PATTERN "*.h")
-file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewer2.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewer2.lib  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewerd2.dll ${SOURCE_PATH}/QGLViewer/QGLViewerd2.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewerd2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+if(CMAKE_HOST_WIN32)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewer2.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+        file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewerd2.dll ${SOURCE_PATH}/QGLViewer/QGLViewerd2.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewer2.lib  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+        file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewerd2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    else()
+        file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewer.lib  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+        file(INSTALL ${SOURCE_PATH}/QGLViewer/QGLViewerd.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    endif()
+elseif(CMAKE_HOST_APPLE)
+    file(INSTALL ${SOURCE_PATH}/QGLViewer/libQGLViewer.a  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+    file(INSTALL ${SOURCE_PATH}/QGLViewer/libQGLViewer.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libqglviewer RENAME copyright)
-- 
cgit v1.2.3