From 0c2878583a7a7857caeef39cec86cbc324b0b6c2 Mon Sep 17 00:00:00 2001
From: flysha <flysha@live.com>
Date: Fri, 14 Oct 2016 08:07:22 +0800
Subject: [PATCH] Improve mongo client port.

---
 ports/libbson/portfile.cmake          | 1 -
 ports/mongo-c-driver/portfile.cmake   | 3 +--
 ports/mongo-cxx-driver/CONTROL        | 2 +-
 ports/mongo-cxx-driver/portfile.cmake | 5 ++---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake
index efa147068d0..ca7e97c168c 100644
--- a/ports/libbson/portfile.cmake
+++ b/ports/libbson/portfile.cmake
@@ -1,6 +1,5 @@
 include(${CMAKE_TRIPLET_FILE})
 include(vcpkg_common_functions)
-find_program(POWERSHELL powershell)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.4.2)
 
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
index 81f0d10a798..df84008e42f 100644
--- a/ports/mongo-c-driver/portfile.cmake
+++ b/ports/mongo-c-driver/portfile.cmake
@@ -1,6 +1,5 @@
 include(${CMAKE_TRIPLET_FILE})
 include(vcpkg_common_functions)
-find_program(POWERSHELL powershell)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.4.2)
 
 vcpkg_download_distfile(ARCHIVE
@@ -18,7 +17,7 @@ vcpkg_apply_patches(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
 	OPTIONS
-		-DBSON_ROOT_DIR=${CURRENT_PACKAGES_DIR}/../libbson_${TARGET_TRIPLET}
+		-DBSON_ROOT_DIR=${CURRENT_INSTALLED_DIR}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL
index 1e0248f0241..1e2611b13d6 100644
--- a/ports/mongo-cxx-driver/CONTROL
+++ b/ports/mongo-cxx-driver/CONTROL
@@ -1,4 +1,4 @@
 Source: mongo-cxx-driver
 Version: 3.0.2
-Build-Depends: boost,mongo-c-driver
+Build-Depends: boost,libbson,mongo-c-driver
 Description: MongoDB C++ Driver.
\ No newline at end of file
diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake
index edfdb3fb7d9..fa29b14a310 100644
--- a/ports/mongo-cxx-driver/portfile.cmake
+++ b/ports/mongo-cxx-driver/portfile.cmake
@@ -1,6 +1,5 @@
 include(${CMAKE_TRIPLET_FILE})
 include(vcpkg_common_functions)
-find_program(POWERSHELL powershell)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.0.2)
 
 vcpkg_download_distfile(ARCHIVE
@@ -18,8 +17,8 @@ vcpkg_apply_patches(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
 	OPTIONS
-		-DLIBBSON_DIR=${CURRENT_PACKAGES_DIR}/../libbson_${TARGET_TRIPLET}
-		-DLIBMONGOC_DIR=${CURRENT_PACKAGES_DIR}/../mongo-c-driver_${TARGET_TRIPLET}
+		-DLIBBSON_DIR=${CURRENT_INSTALLED_DIR}
+		-DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR}
 )
 
 vcpkg_install_cmake()