diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-10-14 17:28:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 17:28:03 -0700 |
| commit | 77c9cc3d1a2aa48d1eca675f65e7f7ee14cc6db8 (patch) | |
| tree | 587823aacae1c54ae88fd0a1633e591059c940f3 | |
| parent | f52268db1add49377ff10c7bdf8a21878372fc3c (diff) | |
| parent | 0c2878583a7a7857caeef39cec86cbc324b0b6c2 (diff) | |
| download | vcpkg-77c9cc3d1a2aa48d1eca675f65e7f7ee14cc6db8.tar.gz vcpkg-77c9cc3d1a2aa48d1eca675f65e7f7ee14cc6db8.zip | |
Merge pull request #162 from sdcb/mongo-client-fix
Improve mongo client port.
| -rw-r--r-- | ports/libbson/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/mongo-c-driver/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/mongo-cxx-driver/CONTROL | 2 | ||||
| -rw-r--r-- | 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 efa147068..ca7e97c16 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 81f0d10a7..df84008e4 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 1e0248f02..1e2611b13 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 edfdb3fb7..fa29b14a3 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() |