diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-05 18:33:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 18:33:07 -0800 |
| commit | 6f2fba24dc5ceb339464e205eb8e7b2afcc31efa (patch) | |
| tree | 60fe329d5b6a1e8b281e069bef29ac476da13822 /scripts | |
| parent | 22b0986cc13bfb2acaa2ea387335b5dc6d128937 (diff) | |
| parent | 6cfbf161f10aa1527da4e7554639887e9ca92f0b (diff) | |
| download | vcpkg-6f2fba24dc5ceb339464e205eb8e7b2afcc31efa.tar.gz vcpkg-6f2fba24dc5ceb339464e205eb8e7b2afcc31efa.zip | |
Merge pull request #9733 from yurybura/master
[boost-iostreams] Remove custom build cmake
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 19 | ||||
| -rw-r--r-- | scripts/boost/post-source-stubs/iostreams.cmake | 18 |
2 files changed, 9 insertions, 28 deletions
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 200b8376e..36ddfe66e 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -46,6 +46,10 @@ function Generate() $controlDeps = ($Depends | sort) -join ", "
$versionSuffix = ""
+ if ($Name -eq "iostreams")
+ {
+ $versionsuffix = "-1"
+ }
mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null
$controlLines = @(
@@ -165,9 +169,6 @@ function Generate() ")"
)
}
- elseif ($PortName -eq "iostreams")
- {
- }
else
{
$portfileLines += @(
@@ -176,13 +177,11 @@ function Generate() )
}
}
- if ($PortName -ne "iostreams")
- {
- $portfileLines += @(
- "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)"
- "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})"
- )
- }
+
+ $portfileLines += @(
+ "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)"
+ "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})"
+ )
if (Test-Path "$scriptsDir/post-build-stubs/$PortName.cmake")
{
diff --git a/scripts/boost/post-source-stubs/iostreams.cmake b/scripts/boost/post-source-stubs/iostreams.cmake deleted file mode 100644 index df1479fb8..000000000 --- a/scripts/boost/post-source-stubs/iostreams.cmake +++ /dev/null @@ -1,18 +0,0 @@ -vcpkg_download_distfile(LICENSE
- URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.72.0/LICENSE_1_0.txt"
- FILENAME "boost_LICENSE_1_0.txt"
- SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-iostreams RENAME copyright)
|