[vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links (#11483)

2 files changed, 12 insertions, 11 deletions

diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
index 8b2c9f249..b4e4abcfe 100644
--- a/ports/libpq/CONTROL
+++ b/ports/libpq/CONTROL
@@ -1,5 +1,5 @@
 Source: libpq
-Version: 12.2-1
+Version: 12.2-2
 Build-Depends: libpq[bonjour] (osx)
 Supports: !uwp
 Homepage: https://www.postgresql.org/
@@ -80,4 +80,4 @@ Build-Depends: libxslt
 Description: Build with libxslt (--with-libxslt)
 
 Feature: client
-Description: Build all client tools and libraries. 
+Description: Build all client tools and libraries.
diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 84cd6c8a2..86281f71b 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -111,7 +111,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
             file(COPY ${SOURCE_FILE} DESTINATION "${BUILDPATH_${_buildtype}}")
         endforeach()
         message(STATUS "Copying libpq source files... done")
-        
+
         vcpkg_apply_patches(
             SOURCE_PATH "${BUILDPATH_${_buildtype}}"
             PATCHES patches/windows/Solution_${_buildtype}.patch
@@ -119,15 +119,15 @@ if(VCPKG_TARGET_IS_WINDOWS)
         )
         message(STATUS "Patches applied!")
         file(COPY "${CURRENT_PORT_DIR}/config.pl" DESTINATION "${BUILDPATH_${_buildtype}}/src/tools/msvc")
-        
+
         set(MSPROJ_PERL "${BUILDPATH_${_buildtype}}/src/tools/msvc/MSBuildProject.pm")
         file(READ "${MSPROJ_PERL}" _contents)
         string(REPLACE "perl" "\"${PERL}\"" _contents "${_contents}")
         file(WRITE "${MSPROJ_PERL}" "${_contents}")
-        
+
         set(CONFIG_FILE "${BUILDPATH_${_buildtype}}/src/tools/msvc/config.pl")
         file(READ "${CONFIG_FILE}" _contents)
-        
+
         ##	ldap      => undef,    # --with-ldap                            ##done
         ##	extraver  => undef,    # --with-extra-version=<string>
         ##	gss       => undef,    # --with-gssapi=<path>
@@ -143,7 +143,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
         ##	xslt      => undef,    # --with-libxslt=<path>                  ##done
         ##	iconv     => undef,    # (not in configure, path to iconv)      ##done (needed by xml)
         ##	zlib      => undef     # --with-zlib=<path>                     ##done
-        
+
         ## Setup external dependencies
         ##"-DFEATURES=core;openssl;zlib" "-DALL_FEATURES=openssl;zlib;readline;libedit;perl;python;tcl;nls;kerberos;systemd;ldap;bsd;pam;llvm;icu;bonjour;uuid;xml;xslt;"
         if("${FEATURES}" MATCHES "ldap")
@@ -183,7 +183,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
         if("${FEATURES}" MATCHES "zlib")
            string(REPLACE "zlib      => undef" "zlib      => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
         endif()
-        
+
         file(WRITE "${CONFIG_FILE}" "${_contents}")
         file(WRITE "${BUILDPATH_${_buildtype}}/src/tools/msvc/buildenv.pl" "${buildenv_contents}")
         vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION)
@@ -193,7 +193,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
             /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION}
             /m
             /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets\"
-            /p:VcpkgTriplet=${TARGET_TRIPLET}"
+            /p:VcpkgTriplet=${TARGET_TRIPLET}
+            /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\""
             )
         if(HAS_TOOLS)
             if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
@@ -241,7 +242,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
         file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
     endif()
-    
+
     if(NOT HAS_TOOLS)
         file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools)
     else()
@@ -290,7 +291,7 @@ endif()
 #vcpkg_copy_pdbs()
 
 #if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.lib")
-    #RENAME debug library due to CMake. In general that is a bad idea but it will have consquences for the generated cmake targets 
+    #RENAME debug library due to CMake. In general that is a bad idea but it will have consquences for the generated cmake targets
     # of other ports if not renamed. Maybe a vcpkg_cmake_wrapper is required here to correct the target information if the rename is removed?
 #    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libpqd.lib")
 #endif()