diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-07-01 13:54:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 13:54:33 -0700 |
| commit | dac4ec2ff36fba7fd5c9d85b2ec9ff484bdbffb2 (patch) | |
| tree | aaf9e5e83100d7be496ef8bab1c3191f2d61d1f7 | |
| parent | 12587b1b882905431d19052b2b068e499a1d9791 (diff) | |
| parent | 9706c31c75ee4cf949b19276645a8a8dbe9596c3 (diff) | |
| download | vcpkg-dac4ec2ff36fba7fd5c9d85b2ec9ff484bdbffb2.tar.gz vcpkg-dac4ec2ff36fba7fd5c9d85b2ec9ff484bdbffb2.zip | |
Merge pull request #7050 from lsparey/master
[mongo-cxx-driver] Do not delete the third_party include folder when building with mnmlstc
| -rw-r--r-- | ports/mongo-cxx-driver/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mongo-cxx-driver/portfile.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL index c1d85e636..b4424e25b 100644 --- a/ports/mongo-cxx-driver/CONTROL +++ b/ports/mongo-cxx-driver/CONTROL @@ -1,5 +1,5 @@ Source: mongo-cxx-driver -Version: 3.4.0-2 +Version: 3.4.0-3 Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility Homepage: https://github.com/mongodb/mongo-cxx-driver Description: MongoDB C++ Driver. diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index 3ff200da3..9f05fedc8 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -83,13 +83,16 @@ set(LIBMONGOCXX_LIBRARIES optimized \${LIBMONGOCXX_LIBRARY_PATH_RELEASE} debug \ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+if (NOT BSONCXX_POLY STREQUAL MNMLSTC)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party)
+endif()
+
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/include/bsoncxx/cmake
${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/private
${CURRENT_PACKAGES_DIR}/include/bsoncxx/private
${CURRENT_PACKAGES_DIR}/include/bsoncxx/test
${CURRENT_PACKAGES_DIR}/include/bsoncxx/test_util
- ${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party
${CURRENT_PACKAGES_DIR}/include/mongocxx/cmake
${CURRENT_PACKAGES_DIR}/include/mongocxx/config/private
|