diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-05 17:52:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 17:52:15 -0700 |
| commit | 74bab196c9e3022c48667e83c1003acf9cc7eebc (patch) | |
| tree | 0c27186a40a6d1104c73f4af757693e23e81a7ab /ports | |
| parent | 1946a8ca9425068b7fd4b465c871bd1a50e5f2f5 (diff) | |
| parent | 2c9ee072da34a925f0faf22596e532d378930582 (diff) | |
| download | vcpkg-74bab196c9e3022c48667e83c1003acf9cc7eebc.tar.gz vcpkg-74bab196c9e3022c48667e83c1003acf9cc7eebc.zip | |
Merge pull request #1873 from glachancecmaisonneuve/buildinstallcmakescriptsfix
Fix for BUILD_ARGS being always added in non ninja build (vcpkg_build_cmake,vcpkg_install_cmake)
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/folly/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 919e799d5..1b30ad86c 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -38,7 +38,7 @@ vcpkg_configure_cmake( # Folly runs built executables during the build, so they need access to the installed DLLs. set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin") -vcpkg_install_cmake(MSVC_64_TOOLSET) +vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index e3cae639c..e7f45c36c 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -58,8 +58,7 @@ vcpkg_configure_cmake( -DCMAKE_INSTALL_CMAKEDIR=share/protobuf ) -# Using 64-bit toolset to avoid occassional Linker Out-of-Memory issues. -vcpkg_install_cmake(MSVC_64_TOOLSET) +vcpkg_install_cmake() # It appears that at this point the build hasn't actually finished. There is probably # a process spawned by the build, therefore we need to wait a bit. |