From 6cfbf161f10aa1527da4e7554639887e9ca92f0b Mon Sep 17 00:00:00 2001 From: yurybura Date: Fri, 17 Jan 2020 12:56:22 +0300 Subject: [PATCH] Remove custom build cmake --- ports/boost-iostreams/CONTROL | 2 +- ports/boost-iostreams/portfile.cmake | 22 ++++--------------- scripts/boost/generate-ports.ps1 | 19 ++++++++-------- .../boost/post-source-stubs/iostreams.cmake | 18 --------------- 4 files changed, 14 insertions(+), 47 deletions(-) delete mode 100644 scripts/boost/post-source-stubs/iostreams.cmake diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL index 2a210483aa..eea49e6f02 100644 --- a/ports/boost-iostreams/CONTROL +++ b/ports/boost-iostreams/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-iostreams -Version: 1.72.0 +Version: 1.72.0-1 Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, liblzma, zlib, zstd Homepage: https://github.com/boostorg/iostreams Description: Boost iostreams module diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index d6412d2542..634a8e2d82 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -11,21 +11,7 @@ vcpkg_from_github( PATCHES Removeseekpos.patch ) -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) +include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 200b8376e3..36ddfe66ea 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 df1479fb87..0000000000 --- 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)