mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
580da706ed
* [capnproto] Remove from baseline. PASSING, REMOVE FROM FAIL LIST: capnproto:x64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: capnproto:x64-windows-static (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: capnproto:x86-windows (.\scripts\ci.baseline.txt) These were fixed by the update to VS2019 version 16.8. Other capnproto skips moved into "supports" because: capnp.lib(serialize-packed.c++.obj) : error LNK2019: unresolved external symbol __popcnt referenced in function "int __cdecl kj::popCount(unsigned int)" (?popCount@kj@@YAHI@Z) i.e. the port wants popcnt to exist and it doesn't, so this isn't an artifact of our CI. * Remove "passing: remove from fail list" entries. * [atk, atkmm, gdk-pixbuf, glibmm, gtkmm, libsigcpp, libxmlpp, pangomm] Acquire using HTTPS. * [chardir] Update osx download. * [leaf] Remove leaf in favor of boost-leaf. ``` Starting package 759/1414: leaf:x86-windows Building package leaf[core]:x86-windows... -- Downloading https://github.com/zajo/leaf/archive/0.2.2.tar.gz... -- Extracting source D:/downloads/zajo-leaf-0.2.2.tar.gz -- Using source at D:/buildtrees/leaf/src/0.2.2-26417cde9d.clean -- Configuring x86-windows -- Building x86-windows-dbg -- Building x86-windows-rel -- Installing: D:/packages/leaf_x86-windows/share/leaf/copyright -- Performing post-build validation -- Performing post-build validation done Uploaded binaries to 1 HTTP remotes. Building package leaf[core]:x86-windows... done Installing package leaf[core]:x86-windows... The following files are already installed in D:/installed/x86-windows and are in conflict with leaf:x86-windows Installed by boost-leaf:x86-windows include/boost/leaf/capture.hpp include/boost/leaf/common.hpp include/boost/leaf/context.hpp include/boost/leaf/detail/all.hpp include/boost/leaf/detail/demangle.hpp include/boost/leaf/detail/function_traits.hpp include/boost/leaf/detail/mp11.hpp include/boost/leaf/detail/optional.hpp include/boost/leaf/detail/print.hpp include/boost/leaf/error.hpp include/boost/leaf/exception.hpp include/boost/leaf/result.hpp Elapsed time for package leaf:x86-windows: 2.931 s ``` Caused by the update to Boost 1.75.0. Because this port is touching include/boost, I'm interpreting that as "the author intends users to use it as a Boost library", and have deleted this port in favor of the Boost version. * [magic-get] Remove magic-get in favor of boost-pfr. * Update ports/chartdir/portfile.cmake Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Restore versions. * format-manifest Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
95 lines
3.6 KiB
CMake
95 lines
3.6 KiB
CMake
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
|
|
|
if(TRIPLET_SYSTEM_ARCH MATCHES "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
|
|
|
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
|
|
|
elseif(VCPKG_TARGET_IS_WINDOWS)
|
|
|
|
vcpkg_download_distfile(ARCHIVE_FILE
|
|
URLS "http://www.advsofteng.net/chartdir_cpp_win.zip"
|
|
FILENAME "chartdir_cpp_win-6.3.1.zip"
|
|
SHA512 e9841d4416c833f57439a36cb981a9c320884c655f8278a22690f05a215c87f0bba83406b45e03ea384c015a4619852c7a9b36dcc9dbd7d531dee1c07b5cffe9
|
|
)
|
|
|
|
vcpkg_extract_source_archive_ex(
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
ARCHIVE ${ARCHIVE_FILE}
|
|
REF 6.3.1
|
|
)
|
|
|
|
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
|
set(LIBDIR "${SOURCE_PATH}/lib64")
|
|
else()
|
|
set(LIBDIR "${SOURCE_PATH}/lib32")
|
|
endif()
|
|
|
|
file(COPY "${LIBDIR}/chartdir60.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
|
|
file(COPY "${LIBDIR}/chartdir60.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
|
file(COPY "${LIBDIR}/chartdir60.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
|
|
file(COPY "${LIBDIR}/chartdir60.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
|
|
|
set(CHARTDIR_LIB "chartdir60.lib")
|
|
|
|
elseif(VCPKG_TARGET_IS_OSX)
|
|
|
|
vcpkg_download_distfile(ARCHIVE_FILE
|
|
URLS "https://www.advsofteng.net/chartdir_cpp_mac.tar.gz"
|
|
FILENAME "chartdir_cpp_mac-6.3.1.51483c1975.tar.gz"
|
|
SHA512 51483c197518203a24f652a4bfd9af1f933f8c59f3d7286e13c612cf09c5b850b4d1e9daa506379218797b5bb79bbc571b9e90b0fbb0f3ef4a3f455dd0de3848
|
|
)
|
|
|
|
vcpkg_extract_source_archive_ex(
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
ARCHIVE ${ARCHIVE_FILE}
|
|
REF 6.3.1
|
|
)
|
|
|
|
file(COPY "${SOURCE_PATH}/lib/libchartdir.6.dylib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
|
file(COPY "${SOURCE_PATH}/lib/libchartdir.6.dylib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
|
|
|
set(CHARTDIR_LIB "libchartdir.6.dylib")
|
|
|
|
elseif(VCPKG_TARGET_IS_LINUX)
|
|
|
|
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
|
|
|
vcpkg_download_distfile(ARCHIVE_FILE
|
|
URLS "http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz"
|
|
FILENAME "chartdir_cpp_linux_64-6.3.1.tar.gz"
|
|
SHA512 e6a3acee3cc5f38304ffa0d3704b1365fcc7a60c8bb688f121caa31efa568b74598b4e10379e84200888d9d8dc3cd7a6a24a944c2d63ca5a146162854c6222a9
|
|
)
|
|
|
|
else()
|
|
|
|
vcpkg_download_distfile(ARCHIVE_FILE
|
|
URLS "http://www.advsofteng.net/chartdir_cpp_linux.tar.gz"
|
|
FILENAME "chartdir_cpp_linux-6.3.1.tar.gz"
|
|
SHA512 0a2f2d7c8d53c2f06c302a837f286826b4f48cc5f5bdb55c4de23337bc4188d1652625aee2c8061561d9b5bdef5e0e2a4cdd176d44ca60c1f730e4f38299c5a0
|
|
)
|
|
|
|
endif()
|
|
|
|
vcpkg_extract_source_archive_ex(
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
ARCHIVE ${ARCHIVE_FILE}
|
|
REF 6.3.1
|
|
)
|
|
|
|
file(COPY "${SOURCE_PATH}/lib/libchartdir.so.6.0.3" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
|
file(COPY "${SOURCE_PATH}/lib/libchartdir.so.6.0.3" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
|
|
|
set(CHARTDIR_LIB "libchartdir.so.6.0.3")
|
|
|
|
file(COPY ${SOURCE_PATH}/lib/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/share/chartdir)
|
|
|
|
endif()
|
|
|
|
file(GLOB HEADERS "${SOURCE_PATH}/include/*.h")
|
|
file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/chartdir)
|
|
file(COPY ${CMAKE_CURRENT_LIST_DIR}/chartdir.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
|
|
|
configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/chartdir/copyright COPYONLY)
|
|
configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/chartdir/chartdir-config.cmake @ONLY)
|
|
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/chartdir)
|