[vcpkg_install_qmake] Add vcpkg_install_qmake (#9412)

* [vcpkg_install_qmake] Add vcpkg_install_qmake and convert existing ports to use it.
[vcpkg_configure_qmake] Add 'staticlib' to CONFIG in static builds

* [vcpkg_configure_qmake] Don't specify DESTDIR

* [libqglviewer][vcpkg_configure_qmake] Add staticlib CONFIG only for libqglviewer

* [qt5-base] Increment version to track changes in vcpkg_configure_qmake()

10 files changed, 45 insertions, 105 deletions

diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL
index 352c7708e..aca80eac2 100644
--- a/ports/libqglviewer/CONTROL
+++ b/ports/libqglviewer/CONTROL
@@ -1,4 +1,4 @@
 Source: libqglviewer

-Version: 2.7.2
+Version: 2.7.2-2

 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/destdir.patch b/ports/libqglviewer/destdir.patch
new file mode 100644
index 000000000..d1cd4f3cc
--- /dev/null
+++ b/ports/libqglviewer/destdir.patch
@@ -0,0 +1,21 @@
+diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro

+index 263a141..51e3359 100644

+--- a/QGLViewer/QGLViewer.pro

++++ b/QGLViewer/QGLViewer.pro

+@@ -38,7 +38,6 @@ SOURCES = \

+ 

+ HEADERS *= $${QGL_HEADERS}

+ DISTFILES *= qglviewer-icon.xpm

+-DESTDIR = $${PWD}

+ 

+ TRANSLATIONS = qglviewer_fr.ts

+ 

+@@ -273,7 +272,7 @@ win32 {

+ 		QMAKE_CXXFLAGS *= -TP -GR

+ 		DEFINES += NOMINMAX

+ 		win32-msvc {

+-			QMAKE_CXXFLAGS *= -EHs -FS

++			QMAKE_CXXFLAGS *= -EHs -FS

+ 		} else {

+ 			QMAKE_CXXFLAGS *= -EHs

+ 		}

diff --git a/ports/libqglviewer/portfile.cmake b/ports/libqglviewer/portfile.cmake
index 991f50d31..0c46c11c2 100644
--- a/ports/libqglviewer/portfile.cmake
+++ b/ports/libqglviewer/portfile.cmake
@@ -1,33 +1,24 @@
-include(vcpkg_common_functions)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO GillesDebunne/libQGLViewer

-    REF fee0916f2af3d0993df51956d2e5a51bbaf0c1f0 #v2.7.2
+    REF fee0916f2af3d0993df51956d2e5a51bbaf0c1f0 #v2.7.2

     SHA512 449bf4ccadaf50d4333bd91050e9b50f440a64229391827aaf4a80ade2c3f5fc60501d2baee885cf1214f7e2a8a04615bafe9ac7da9f866ffa4ebe33b9b999d8

     HEAD_REF master

     PATCHES

         use-default-config-on-all-platforms.patch

+        destdir.patch

 )

 

-vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro)

+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

+    set(OPTIONS CONFIG*=staticlib)

+endif()

 

-vcpkg_build_qmake()

+vcpkg_configure_qmake(

+    SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro

+    OPTIONS ${OPTIONS}

+)

 

-file(INSTALL ${SOURCE_PATH}/QGLViewer DESTINATION ${CURRENT_PACKAGES_DIR}/include  FILES_MATCHING  PATTERN "*.h")

-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()

+vcpkg_install_qmake()

 

+file(INSTALL ${SOURCE_PATH}/QGLViewer DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h")

 file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libqglviewer RENAME copyright)

diff --git a/ports/qcustomplot/CONTROL b/ports/qcustomplot/CONTROL
index 4b8223844..90eb89b22 100644
--- a/ports/qcustomplot/CONTROL
+++ b/ports/qcustomplot/CONTROL
@@ -1,4 +1,4 @@
 Source: qcustomplot

-Version: 2.0.1-1

+Version: 2.0.1-3

 Description: QCustomPlot is a Qt C++ widget for plotting and data visualization.

 Build-Depends: qt5-base

diff --git a/ports/qcustomplot/portfile.cmake b/ports/qcustomplot/portfile.cmake
index d35c67d01..ba153e79a 100644
--- a/ports/qcustomplot/portfile.cmake
+++ b/ports/qcustomplot/portfile.cmake
@@ -24,46 +24,16 @@ vcpkg_configure_qmake(SOURCE_PATH
     ${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro

 )

 

-vcpkg_build_qmake(

+vcpkg_install_qmake(

     RELEASE_TARGETS release-all

     DEBUG_TARGETS debug-all

 )

 

-set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")

-set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")

-

 # Install header file

 file(INSTALL ${SOURCE_PATH}/qcustomplot.h

     DESTINATION ${CURRENT_PACKAGES_DIR}/include

 )

 

-# Install module files

-macro(_install_module_file source_dir target_dir filename_regex)

-    file(GLOB _files ${source_dir}/*)

-    list(FILTER _files INCLUDE REGEX ${filename_regex})

-    file(INSTALL ${_files} DESTINATION ${target_dir})

-endmacro()

-

-_install_module_file(${DEBUG_DIR}/debug

-    ${CURRENT_PACKAGES_DIR}/debug/lib

-    "qcustomplotd[2]*\.(lib|a)$")

-

-_install_module_file(${RELEASE_DIR}/release

-    ${CURRENT_PACKAGES_DIR}/lib

-    "qcustomplot[2]*\.(lib|a)$")

-

-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

-    file(INSTALL

-        ${DEBUG_DIR}/debug/qcustomplotd2.dll

-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin

-    )

-

-    file(INSTALL

-        ${RELEASE_DIR}/release/qcustomplot2.dll

-        DESTINATION ${CURRENT_PACKAGES_DIR}/bin

-    )

-endif()

-

 vcpkg_copy_pdbs()

 

 # Handle copyright

diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL
index 3e8d82c92..de1622354 100644
--- a/ports/qscintilla/CONTROL
+++ b/ports/qscintilla/CONTROL
@@ -1,5 +1,5 @@
 Source: qscintilla
-Version: 2.10-9
+Version: 2.10-11
 Homepage: https://sourceforge.net/projects/pyqt
 Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)
 Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows)
diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake
index d979f3135..d34d5517c 100644
--- a/ports/qscintilla/portfile.cmake
+++ b/ports/qscintilla/portfile.cmake
@@ -19,10 +19,6 @@ vcpkg_add_to_path(PREPEND ${PYTHON_PATH})
 vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin)
 vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin)
 
-#Store build paths
-set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
-set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
-
 vcpkg_configure_qmake(
     SOURCE_PATH ${SOURCE_PATH}/Qt4Qt5
     OPTIONS
@@ -32,31 +28,17 @@ vcpkg_configure_qmake(
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_build_qmake(
+    vcpkg_install_qmake(
         RELEASE_TARGETS release
         DEBUG_TARGETS debug
     )
 else()
-    vcpkg_build_qmake()
+    vcpkg_install_qmake()
 endif()
 
 file(GLOB HEADER_FILES ${SOURCE_PATH}/Qt4Qt5/Qsci/*)
 file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci)
 
-if(VCPKG_TARGET_IS_WINDOWS)
-    configure_file(${RELEASE_DIR}/release/qscintilla2_qt5.lib ${CURRENT_PACKAGES_DIR}/lib/qscintilla2.lib COPYONLY)
-    configure_file(${DEBUG_DIR}/debug/qscintilla2_qt5.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qscintilla2.lib COPYONLY)
-
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        file(COPY ${RELEASE_DIR}/release/qscintilla2_qt5.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-        file(COPY ${DEBUG_DIR}/debug/qscintilla2_qt5.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    endif()
-elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
-    configure_file(${RELEASE_DIR}/libqscintilla2_qt5.a ${CURRENT_PACKAGES_DIR}/lib/libqscintilla2.a COPYONLY)
-    configure_file(${DEBUG_DIR}/libqscintilla2_qt5.a ${CURRENT_PACKAGES_DIR}/debug/lib/libqscintilla2.a COPYONLY)
-endif()
-
-
 vcpkg_copy_pdbs()
 
 # Handle copyright
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index 59fd6788c..7cd856203 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-base

-Version: 5.12.5-3

+Version: 5.12.5-7

 Homepage: https://www.qt.io/

 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.

 Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl

diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index 62235f3c3..639036550 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,5 +1,5 @@
 Source: qwt
-Version: 6.1.3-8
+Version: 6.1.3-10
 Homepage: https://sourceforge.net/projects/qwt
 Description: Qt widgets library for technical applications
 Build-Depends: qt5-base, qt5-svg, qt5-tools
diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake
index ca5762d42..dce59e8e5 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -12,52 +12,28 @@ vcpkg_extract_source_archive_ex(
     PATCHES fix-dynamic-static.patch
 )
 
-set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
-set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
-
 vcpkg_configure_qmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         CONFIG+=${VCPKG_LIBRARY_LINKAGE}
 )
 
-if (CMAKE_HOST_WIN32)
-    vcpkg_build_qmake(
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_install_qmake(
         RELEASE_TARGETS sub-src-release_ordered
         DEBUG_TARGETS sub-src-debug_ordered
     )
-elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX
-    vcpkg_build_qmake(
+else ()
+    vcpkg_install_qmake(
         RELEASE_TARGETS sub-src-all-ordered
         DEBUG_TARGETS sub-src-all-ordered
     )
 endif()
 
-#Set the correct install directory to packages
-foreach(MAKEFILE ${RELEASE_MAKEFILES} ${DEBUG_MAKEFILES})
-    vcpkg_replace_string(${MAKEFILE} "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}")
-endforeach()
-
 #Install the header files
 file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h)
 file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/qwt)
 
-#Install the module files
-if (CMAKE_HOST_WIN32)
-    file(INSTALL ${RELEASE_DIR}/lib/qwt.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(INSTALL ${DEBUG_DIR}/lib/qwtd.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        file(INSTALL ${RELEASE_DIR}/lib/qwt.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-        file(INSTALL ${DEBUG_DIR}/lib/qwtd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    endif()
-    vcpkg_copy_pdbs()
-elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX
-    file(INSTALL ${RELEASE_DIR}/lib/libqwt.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(INSTALL ${DEBUG_DIR}/lib/libqwt.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-endif()
-
-
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/qwt)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/qwt/COPYING ${CURRENT_PACKAGES_DIR}/share/qwt/copyright)
\ No newline at end of file
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/qwt/COPYING ${CURRENT_PACKAGES_DIR}/share/qwt/copyright)