Merge branch 'master' into protobuf

This commit is contained in:
Alexander Karatarakis 2018-08-02 15:43:48 -07:00 committed by GitHub
commit 7dba50c8e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 470 additions and 82 deletions

View File

@ -1,3 +1,3 @@
Source: boost-di
Version: 1.0.1
Version: 1.0.2
Description: C++14 Dependency Injection Library.

View File

@ -1,11 +1,11 @@
#header-only library
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/di-1.0.1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/di-1.0.2)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/boost-experimental/di/archive/v1.0.1.tar.gz"
FILENAME "di-1.0.1.tar.gz"
SHA512 4e7270be51e7c8d0dcb6e0ba4bcf8e12904016086bdd59667954815f4acb03fc62447775885594a8403f5067a20b2520717fe979926d740dff0efa0c97ebf20c
URLS "https://github.com/boost-experimental/di/archive/v1.0.2.tar.gz"
FILENAME "di-1.0.2.tar.gz"
SHA512 1a5fc3738db2c3c18c198ce58e82a60f4f3d39fb66c9dc2b465df89da66a19ffca79eca148e68cd70c76524185ba2145e2857504a25eda4fa70ffd2f05f3be40
)
vcpkg_extract_source_archive(${ARCHIVE})

View File

@ -1,3 +1,3 @@
Source: botan
Version: 2.6.0-2
Version: 2.8.0
Description: A cryptography library written in C++11

View File

@ -1,13 +0,0 @@
diff --git a/cc/msvc.txt b/cc/msvc.txt
index ed32a3c..9e78fff 100644
--- a/cc/msvc.txt
+++ b/cc/msvc.txt
@@ -10,7 +10,7 @@ add_include_dir_option "/I"
add_lib_dir_option "/LIBPATH:"
add_lib_option ""
-compile_flags "/nologo /c"
+compile_flags "/nologo /c /D_ENABLE_EXTENDED_ALIGNED_STORAGE"
optimization_flags "/O2 /Oi"
size_optimization_flags "/O1 /Os"

View File

@ -1,20 +1,13 @@
include(vcpkg_common_functions)
set(BOTAN_VERSION 2.6.0)
set(BOTAN_HASH 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Botan-${BOTAN_VERSION})
set(BOTAN_VERSION 2.8.0)
vcpkg_download_distfile(ARCHIVE
URLS "https://botan.randombit.net/releases/Botan-${BOTAN_VERSION}.tgz"
FILENAME "Botan-${BOTAN_VERSION}.tgz"
SHA512 ${BOTAN_HASH}
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}/src/build-data
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-C2338.patch
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO randombit/botan
REF cb14e9ce95bcaae2ada7ffe96ef0cce6a2b38593
SHA512 3d8fbf1c65e2b0259f225db46ffa4a7eb989a518b230574e94f82dc13afd7dc32cfe6a8a0127e7dd0dea30e06f3946db78db50e107937382eff8ed823e996dc3
HEAD_REF master
)
vcpkg_find_acquire_program(JOM)

View File

@ -0,0 +1,13 @@
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 3b308757..36700ff0 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -67,7 +67,7 @@
#include FT_LCD_FILTER_H
#endif
-#if HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H)
#include <unistd.h>
#else
#define access(p, m) 0

View File

@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.0)
project(cairo C)
# Add include directories
include_directories("." "./win32")
include_directories(".")
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
include_directories("./win32")
endif()
file(GLOB SOURCES
"cairo-analysis-surface.c"
@ -112,15 +115,6 @@ file(GLOB SOURCES
"cairo-user-font.c"
"cairo-version.c"
"cairo-wideint.c"
# win32
"win32/cairo-win32-debug.c"
"win32/cairo-win32-device.c"
"win32/cairo-win32-gdi-compositor.c"
"win32/cairo-win32-system.c"
"win32/cairo-win32-surface.c"
"win32/cairo-win32-display-surface.c"
"win32/cairo-win32-printing-surface.c"
"win32/cairo-win32-font.c"
# generic font support
"cairo-cff-subset.c"
"cairo-scaled-font-subsets.c"
@ -148,6 +142,22 @@ file(GLOB SOURCES
"cairo-ft-font.c"
)
# win32
file(GLOB PLATFORM_SOURCES_WIN32
"win32/cairo-win32-debug.c"
"win32/cairo-win32-device.c"
"win32/cairo-win32-gdi-compositor.c"
"win32/cairo-win32-system.c"
"win32/cairo-win32-surface.c"
"win32/cairo-win32-display-surface.c"
"win32/cairo-win32-printing-surface.c"
"win32/cairo-win32-font.c"
)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
list(APPEND SOURCES ${PLATFORM_SOURCES_WIN32})
endif()
set(CMAKE_DEBUG_POSTFIX "d")
find_package(ZLIB REQUIRED)
@ -172,10 +182,27 @@ add_definitions(
# Find FontConfig
find_library(FONTCONFIG_LIBRARY fontconfig)
# additional features for macOS
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_definitions(
-DHAVE_INTTYPES_H=1
-DHAVE_STDINT_H=1
-DHAVE_SYS_TYPES_H=1
-DHAVE_UINT64_T=1
-DHAVE_UNISTD_H=1
-DCAIRO_HAS_PTHREAD=1
-DCAIRO_HAS_REAL_PTHREAD=1)
endif()
add_library(cairo ${SOURCES})
# cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
target_compile_options(cairo PUBLIC "/wd4244" PUBLIC "/wd4146" PUBLIC "/wd4312" PUBLIC "/wd4267"
PUBLIC "/wd4996" PUBLIC "/wd4311" PUBLIC "/wd4334" PUBLIC "/wd4101")
if(MSVC)
# cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
# NOTE: options only available to MSVC, clang in macOS doesn't understand these flags
target_compile_options(cairo PUBLIC "/wd4244" PUBLIC "/wd4146" PUBLIC "/wd4312" PUBLIC "/wd4267"
PUBLIC "/wd4996" PUBLIC "/wd4311" PUBLIC "/wd4334" PUBLIC "/wd4101")
endif()
target_link_libraries(cairo gdi32 msimg32 user32 ZLIB::ZLIB PNG::PNG freetype ${PIXMAN_LIBRARY} ${FONTCONFIG_LIBRARY})
install(TARGETS cairo

View File

@ -1,4 +1,4 @@
Source: cairo
Version: 1.15.8-1
Version: 1.15.8-2
Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig

View File

@ -19,6 +19,7 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/export-only-in-shared-build.patch"
"${CMAKE_CURRENT_LIST_DIR}/0001_fix_osx_defined.patch"
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src)

View File

@ -1,3 +1,3 @@
Source: cxxopts
Version: 2.1.0
Version: 2.1.0-1
Description: This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options

View File

@ -6,6 +6,18 @@ vcpkg_from_github(
SHA512 b3549bb36fd3cb27b30a7164992ce19ddf129e7ee071956d58047101e4181cd9f08c8dd4c5e2d5499628deeb52a40bbc2fecfe68e9875c07396e6b7434161603
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/include/cxxopts.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DCXXOPTS_BUILD_EXAMPLES=OFF
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cxxopts TARGET_PATH share/cxxopts)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cxxopts RENAME copyright)
vcpkg_copy_pdbs()

View File

@ -1,5 +1,5 @@
Source: dlib
Version: 19.14
Version: 19.15
Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack
Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++

View File

@ -8,8 +8,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO davisking/dlib
REF v19.14
SHA512 ef4f7b109112c12cecf35543ff81c5d7c7a1f0cadca53eb6302f58329b875af3fa95f3da002e4d66e2d9f4b81256245b016e97b3e3c90f0bfcb94568328175ca
REF v19.15
SHA512 e815d4cd3cf75de4bf3df25597f1b13e831129b8e780909194be05bde4c811792886e7370980edf0fe294aa1ad7a69ba9b9ca729e05713d3ee4f6aa4236baaf7
HEAD_REF master
)

View File

@ -1,3 +1,3 @@
Source: eigen3
Version: 3.3.4-2
Version: 3.3.5
Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.

View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eigenteam/eigen-git-mirror
REF 3.3.4
SHA512 da3f96ef65c64031bed5311d4ad95cd668f2facb3439bb1f4ecea10ce7cf881daf9d053567fe4ebb50626ab4dbb975d1f74bd632626c688898a97064f99a8f59
REF 3.3.5
SHA512 398d864bb3c12be9b1d7081bac1343d54b1edf65f165be54814794cd8d36c35035340384a97ad203e5295d466445dfbad4225d86748c8d31c322948de9a33a3f
HEAD_REF master
)

3
ports/getopt/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: getopt
Version: 0.1
Description: The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.

View File

@ -0,0 +1,64 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/getopt-0.1)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
set(MSBUILD_PLATFORM x64)
else()
set(MSBUILD_PLATFORM Win32)
endif()
set(DEBUG_CONFIG Debug)
set(RELEASE_CONFIG Release)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/libimobiledevice-win32/getopt/archive/0.1.zip"
FILENAME "getopt-0.1.zip"
SHA512 7d9786222b6934b80ff2d03e20f211bf289e494ec388842b245f86a5c6bb3a403baba088ceb2e05a460c5523f63f4dd2dc6854a4cc50b1360f168b4f34573a3d
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/getopt.vcxproj
DEBUG_CONFIGURATION ${DEBUG_CONFIG}
RELEASE_CONFIGURATION ${RELEASE_CONFIG}
)
# Copy headers
file(COPY ${SOURCE_PATH}/getopt.h
DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
# Copy binary files
file (MAKE_DIRECTORY
${CURRENT_PACKAGES_DIR}/bin
${CURRENT_PACKAGES_DIR}/debug/bin)
file (MAKE_DIRECTORY
${CURRENT_PACKAGES_DIR}/lib
${CURRENT_PACKAGES_DIR}/debug/lib)
file(COPY ${SOURCE_PATH}/${MSBUILD_PLATFORM}/${DEBUG_CONFIG}/getopt.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
file(COPY ${SOURCE_PATH}/${MSBUILD_PLATFORM}/${RELEASE_CONFIG}/getopt.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
file(COPY ${SOURCE_PATH}/${MSBUILD_PLATFORM}/${DEBUG_CONFIG}/getopt.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
file(COPY ${SOURCE_PATH}/${MSBUILD_PLATFORM}/${RELEASE_CONFIG}/getopt.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(COPY ${SOURCE_PATH}/${MSBUILD_PLATFORM}/${DEBUG_CONFIG}/getopt.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
file(COPY ${SOURCE_PATH}/${MSBUILD_PLATFORM}/${RELEASE_CONFIG}/getopt.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/getopt RENAME copyright)

3
ports/laszip/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: laszip
Version: 3.2.2-1
Description: LASzip - free and lossless LiDAR compression

View File

@ -0,0 +1,28 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LASzip/LASzip
REF 3.2.2
SHA512 c4dac1fd525b1889fa8cc77f168bc3c83053619402ec13ac0ae58665cfd4440b9135ce30c4ade925a0ac9db7e3f717344859e511b2207841c84dc2453c6cf7f7
HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LASZIP_BUILD_STATIC)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DLASZIP_BUILD_STATIC=${LASZIP_BUILD_STATIC}
)
vcpkg_install_cmake()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/laszip RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Remove laszip_api3 dll since it doesn't export functions properly during build.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/laszip_api3.dll)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/laszip_api3.dll)

3
ports/libmorton/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: libmorton
Version: 2018-19-07
Description: header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates

View File

@ -0,0 +1,15 @@
#header-only library
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Forceflow/libmorton
REF 797ea736dca49553a56089f143ee6d1effdd318e
SHA512 ee9632f5c873462842d18014d4fd2d461e9fe767659e7426a7dec90fcc06cb974fb064229db5622c38ad0af9509004edea87e0f1d57ad09d8d1d236a5b9579a0
HEAD_REF master
)
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmorton)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmorton/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmorton/copyright)
file(GLOB HEADER_FILES ${SOURCE_PATH}/libmorton/include/*.h)
file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/libmorton)

View File

@ -1,3 +1,3 @@
Source: libp7-baical
Version: 4.4-2
Version: 4.4-3
Description: P7 is a library for high-speed sending telemetry & trace data from application

View File

@ -9,7 +9,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
endif()
set(LIBP7_VERSION 4.4)
set(LIBP7_HASH ce33db9a0c731e4dff95646703fe5fd96015f1c528377aa5dbe2e533529b0e8c45a4b74ee2b4616a811a7f9038c12edf106b08b3c21cec9cb6bdf85ad6e1d64f)
set(LIBP7_HASH 500fefdf6fb01999ddb2accc8309cf8749fb7a65abb98faaf6d71a5ae3da4eac8c00c083905b01f7f6cc973387b605f2c4db0bb007562f76b7ad43b6abe2b91f)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libP7_v${LIBP7_VERSION})
vcpkg_download_distfile(ARCHIVE

View File

@ -1,4 +1,4 @@
Source: libssh2
Version: 1.8.0-3
Version: 1.8.0-4
Build-Depends: zlib, openssl
Description: The SSH library

View File

@ -1,16 +1,14 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libssh2-1.8.0)
vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://www.libssh2.org/download/libssh2-1.8.0.tar.gz"
FILENAME "libssh2-1.8.0.tar.gz"
SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libssh2/libssh2
REF libssh2-1.8.0
SHA512 c157db0628126d6348ed52a698fbdd7e20b54b6115123bd7d238f02fda5c68ca7a1585aed8a2376df0840f4a3823743133996192001ae54864ab53c954b938e7
HEAD_REF master
PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch"
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
@ -33,4 +31,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libssh2)
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libssh2 RENAME copyright)
vcpkg_copy_pdbs()
vcpkg_copy_pdbs()

View File

@ -1,4 +1,4 @@
Source: log4cplus
Version: REL_2_0_0-RC2
Version: REL_2_0_1
Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration
Build-Depends: catch

View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO log4cplus/log4cplus
REF REL_2_0_0-RC2
SHA512 34392d85088534e0661e6fa9726c5970647a5acaa559bafb5d3746a70f5baca01012f457d50c15e73d9aca1d3ed9ec99028cc65fab07f73cdadbbc0b4329bcb5
REF REL_2_0_1
SHA512 7a84bf237bb5db3eccd90196c0f97adb75d0dd247d73852150078b9458f169d883f3ae92908217ea668bcf25c64766c86380bbcc64b432eb1bae6427c9268b18
HEAD_REF master
)

View File

@ -1,3 +1,3 @@
Source: nlopt
Version: 2.4.2-c43afa08d~vcpkg1-1
Version: 2.4.2-1226c127
Description: a library for nonlinear local and global optimization, for functions with and without gradient information.

View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stevengj/nlopt
REF c43afa08d4fe086d9c00c37924a6bd4c9de71816
SHA512 e063d748b040f081a648b33dadaf9b7deef63ff3be0cffd8988816701c18694202f5bcf06a18991f1f4b35014e3f406ffa4404d4036ff7625d3680bd5e24f8e4
REF 1226c1276dacf3687464c65eb165932281493a35
SHA512 889f60cd6970b17296871396366bd0d868011d71ca4b88cb6da906283f928e5b443ab18c5af48a0701c8bf68b6d66288a3e4f248e0ab8183251aa7c3b0cfd652
HEAD_REF master
)

3
ports/pcg/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: pcg
Version: 0.98.1
Description: Permuted Congruential Generator

14
ports/pcg/portfile.cmake Normal file
View File

@ -0,0 +1,14 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO imneme/pcg-cpp
REF v0.98.1
SHA512 3625913eba3b5d3ff0763a00728535cd5273a335f0ce0a9ab8e0cd8183a52309cbf72ae50d089cfea89445201993466a5533469db1cb6e82b14c62564731fe70
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/include/pcg_extras.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(INSTALL ${SOURCE_PATH}/include/pcg_random.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(INSTALL ${SOURCE_PATH}/include/pcg_uint128.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/pcg RENAME copyright)

View File

@ -1,4 +1,4 @@
Source: pdal
Version: 1.7.1-2
Version: 1.7.1-3
Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.
Build-Depends: gdal, geos, jsoncpp, libgeotiff
Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip

View File

@ -4,6 +4,11 @@ project(pixman VERSION 0.32.0 LANGUAGES C)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
set(CMAKE_DEBUG_POSTFIX "d")
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_definitions(-DTLS=__thread)
add_definitions(-DHAVE_PTHREADS)
endif()
include_directories(".")
file(GLOB SOURCES

View File

@ -1,3 +1,3 @@
Source: pixman
Version: 0.34.0-2
Version: 0.34.0-3
Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.

View File

@ -1,3 +1,3 @@
Source: pmdk
Version: 1.4.1
Version: 1.4.1-1
Description: Persistent Memory Development Kit

View File

@ -19,7 +19,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO pmem/pmdk
REF 1.4.1
SHA512 c5398a0b728803f3ccc0787682a749e9685924338532f6ec61299e865fec60c0fd13b3bfafe65794a251fe809e69b321812b6c2fb27e3f08651e6e6abe8e1923
SHA512 a4bffb393f07e5e2ffbd2a7835b906148401abf0f3cff28262cf8607691fc2d567d153358a3fb3a15197db699519c7b3a4699b67a51c15fecd707bc30795c5c7
HEAD_REF master
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/addPowerShellExecutionPolicy.patch"

View File

@ -0,0 +1,63 @@
cmake_minimum_required(VERSION 3.0)
project(readline C)
if(CMAKE_BUILD_TYPE STREQUAL Debug)
set(LIB_SUFFIX d)
endif()
add_definitions(-DREADLINE_LIBRARY)
add_definitions(-DBUILD_READLINE_DLL)
add_definitions(-DHAVE_CONFIG_H)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
if(CMAKE_BUILD_TYPE STREQUAL Debug)
add_definitions(-D_DEBUG)
endif()
add_definitions(-D_WINDOWS)
add_definitions(-D_USRDLL)
add_definitions(-DREADLINE_EXPORTS)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR} # thats where the config.h is located
)
add_library(readline
readline.c
funmap.c
keymaps.c
vi_mode.c
parens.c
rltty.c
complete.c
bind.c
isearch.c
display.c
signals.c
util.c
kill.c
undo.c
macro.c
input.c
callback.c
terminal.c
xmalloc.c
history.c
histsearch.c
histexpand.c
histfile.c
nls.c
search.c
shell.c
savestring.c
tilde.c
text.c
misc.c
compat.c
mbutil.c
support/wcwidth.c)
install(TARGETS readline
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)

3
ports/readline/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: readline
Version: 5.0-1
Description: GNU readline

58
ports/readline/config.h Normal file
View File

@ -0,0 +1,58 @@
#define RETSIGTYPE void
#define VOID_SIGHANDLER 1
#define PROTOTYPES 1
#define HAVE_ISASCII 1
#define HAVE_ISXDIGIT 1
#define HAVE_MBRLEN 1
#define HAVE_MBRTOWC 1
#define HAVE_MBRTOWC 1
#define HAVE_MBSRTOWCS 1
#define HAVE_MEMMOVE 1
#define HAVE_PUTENV 1
#define HAVE_SETENV 1
#define HAVE_SETLOCALE 1
#define HAVE_STRCOLL 1
#define STRCOLL_BROKEN 1
#define HAVE_STRPBRK 1
#define HAVE_TCGETATTR 1
#define HAVE_VSNPRINTF 1
#define HAVE_WCTOMB 1
#define HAVE_WCWIDTH 1
#define STDC_HEADERS 1
#define HAVE_LANGINFO_H 1
#define HAVE_LIMITS_H 1
#define HAVE_LOCALE_H 1
#define HAVE_MEMORY_H 1
#define HAVE_STDARG_H 1
#define HAVE_STDLIB_H 1
#define HAVE_STRING_H 1
#define HAVE_TERMIOS_H 1
#define HAVE_WCHAR_H 1
#define HAVE_WCTYPE_H 1
#define HAVE_MBSTATE_T 1
#define HAVE_LANGINFO_CODESET 1
#define VOID_SIGHANDLER 1
#define STRUCT_WINSIZE_IN_SYS_IOCTL 1
#define HAVE_GETPW_DECLS 1
#define MUST_REINSTALL_SIGHANDLERS 1
#define CTYPE_NON_ASCII 1
/* Ultrix botches type-ahead when switching from canonical to
non-canonical mode, at least through version 4.3 */
#if !defined (HAVE_TERMIOS_H) || !defined (HAVE_TCGETATTR) || defined (ultrix)
# define TERMIOS_MISSING
#endif
#if defined (STRCOLL_BROKEN)
# define HAVE_STRCOLL 1
#endif
#if defined (__STDC__) && defined (HAVE_STDARG_H)
# define PREFER_STDARG
# define USE_VARARGS
#else
# if defined (HAVE_VARARGS_H)
# define PREFER_VARARGS
# define USE_VARARGS
# endif
#endif

View File

@ -0,0 +1,48 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/readline-vs/src/readline/5.0/readline-5.0-src)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/lltcggie/readline/archive/vs.zip"
FILENAME "readline-5.0-1-src.zip"
SHA512 c67908b9c868aa611a48dfc4db43718169cbdc6784107beb22cd1a4d28f0c4aa88f30cae0839a530c481c74173e1d7a2bf0000596099ed9b940c05c9dc7d5ebc
)
vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH})
if(VCPKG_CRT_LINKAGE STREQUAL static)
set(LIBVPX_CRT_LINKAGE --enable-static-msvcrt)
set(LIBVPX_CRT_SUFFIX mt)
else()
set(LIBVPX_CRT_SUFFIX md)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA)
vcpkg_install_cmake()
# Copy headers
file (MAKE_DIRECTORY
${CURRENT_PACKAGES_DIR}/include/readline)
file(GLOB headers "${SOURCE_PATH}/*.h")
file(COPY ${headers} DESTINATION ${CURRENT_PACKAGES_DIR}/include/readline)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/readline RENAME copyright)

View File

@ -38,7 +38,14 @@ if(REL_EXES)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/rttr)
file(COPY ${REL_EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/rttr)
endif()
file(REMOVE ${REL_EXES} ${DBG_EXES})
if(REL_EXES)
file(REMOVE ${REL_EXES})
endif(REL_EXES)
if(DBG_EXES)
file(REMOVE ${DBG_EXES})
endif(DBG_EXES)
#Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rttr)

35
toolsrc/vcpkg.natvis Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
<Type Name="vcpkg::ErrorHolder&lt;std::error_code&gt;">
<DisplayString Condition="m_err._Myval!=0">{m_err}</DisplayString>
<DisplayString Condition="m_err._Myval==0"></DisplayString>
</Type>
<Type Name="vcpkg::ErrorHolder&lt;*&gt;">
<DisplayString Condition="m_is_error==true">{m_err}</DisplayString>
<DisplayString Condition="m_is_error==false"></DisplayString>
</Type>
<Type Name="vcpkg::ExpectedT&lt;*,std::error_code&gt;">
<DisplayString Condition="m_s.m_err._Myval==0">val: {m_t}</DisplayString>
<DisplayString Condition="m_s.m_err._Myval!=0">err: {m_s}</DisplayString>
</Type>
<Type Name="vcpkg::ExpectedT&lt;*,*&gt;">
<DisplayString Condition="m_s.m_is_error==false">val: {m_t}</DisplayString>
<DisplayString Condition="m_s.m_is_error==true">err: {m_s}</DisplayString>
</Type>
<Type Name="vcpkg::Optional&lt;*&gt;">
<DisplayString Condition="m_base.m_is_present==true">{m_base.m_t}</DisplayString>
<DisplayString Condition="m_base.m_is_present==false">empty</DisplayString>
</Type>
<Type Name="vcpkg::TripletInstance">
<DisplayString>{*(std::string*)this}</DisplayString>
</Type>
<Type Name="vcpkg::Triplet">
<DisplayString>{m_instance}</DisplayString>
</Type>
<Type Name="vcpkg::StringLiteral">
<DisplayString>{m_cstr}</DisplayString>
</Type>
<Type Name="std::experimental::filesystem::v1::path">
<DisplayString>{_Mystr}</DisplayString>
</Type>
</AutoVisualizer>

View File

@ -47,6 +47,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cmake", "cmake", "{A0122231
..\scripts\cmake\vcpkg_install_meson.cmake = ..\scripts\cmake\vcpkg_install_meson.cmake
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BCE555DF-F471-4ACC-98E5-76CBE8E8F79E}"
ProjectSection(SolutionItems) = preProject
vcpkg.natvis = vcpkg.natvis
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64