[vcpkg-build-qmake][vcpkg-configure-qmake] Collapse config-specific versions.

2 files changed, 8 insertions, 48 deletions

diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index 5bf85ad95..9dcf19f5b 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,4 +1,4 @@
 Source: qwt
-Version: 6.1.3-3
+Version: 6.1.3-4
 Description: Qt widgets library for technical applications
 Build-Depends: qt5-base, qt5-svg
diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake
index f4be871b7..918914a01 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -21,57 +21,16 @@ else()
     )
 endif()
 
-# The qwt build requires zlib1.dll
-SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${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")
 
-file(REMOVE_RECURSE "${DEBUG_DIR}" "${RELEASE_DIR}")
-
-#Configure debug
-vcpkg_configure_qmake_debug(
-    SOURCE_PATH ${SOURCE_PATH}
-)
-
-#First generate the makefiles so we can modify them
-vcpkg_build_qmake_debug(TARGETS qmake_all)
-
-#Store debug makefiles path
-file(GLOB_RECURSE DEBUG_MAKEFILES ${DEBUG_DIR}/*Makefile*)
-
-foreach(DEBUG_MAKEFILE ${DEBUG_MAKEFILES})
-    file(READ "${DEBUG_MAKEFILE}" _contents)
-    string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
-    string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
-    string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}")
-    file(WRITE "${DEBUG_MAKEFILE}" "${_contents}")
-endforeach()
-
-#Build debug
-vcpkg_build_qmake_debug(TARGETS sub-src-debug_ordered)
+vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH})
 
-#Configure release
-vcpkg_configure_qmake_release(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_build_qmake(
+    RELEASE_TARGETS sub-src-release_ordered
+    DEBUG_TARGETS sub-src-debug_ordered
 )
 
-#First generate the makefiles so we can modify them
-vcpkg_build_qmake_release(TARGETS qmake_all)
-
-#Store release makefile path
-file(GLOB_RECURSE RELEASE_MAKEFILES ${RELEASE_DIR}/*Makefile*)
-
-foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
-    file(READ "${RELEASE_MAKEFILE}" _contents)
-    string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}")
-    file(WRITE "${RELEASE_MAKEFILE}" "${_contents}")
-endforeach()
-
-#Build release
-vcpkg_build_qmake_release(TARGETS sub-src-release_ordered)
-
 #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}")
@@ -92,7 +51,7 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     file(INSTALL
         ${RELEASE_DIR}/lib/qwt.dll
         DESTINATION ${CURRENT_PACKAGES_DIR}/bin
@@ -100,11 +59,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 
     file(INSTALL
         ${DEBUG_DIR}/lib/qwtd.dll
-        ${DEBUG_DIR}/lib/qwtd.pdb
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
     )
 endif()
 
+vcpkg_copy_pdbs()
+
 # 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)