The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-21 18:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Mikhaylov Anton 2020-02-04 13:40:15 +05:00
commit d56ed7ee76
346 changed files with 5238 additions and 2935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
docs/maintainers/control-files.md
View File

@ -8,7 +8,7 @@ Field names are case-sensitive and start the line without leading whitespace. P
## Source Paragraph
The first paragraph in a `CONTROL` file is the Source paragraph. It must have a `Source`, `Version`, and `Description` field. It can optionally have a `Build-Depends` and `Default-Features` field.
The first paragraph in a `CONTROL` file is the Source paragraph. It must have a `Source`, `Version`, and `Description` field. The full set of fields is documented below.
### Examples:
```no-highlight
@ -58,7 +58,7 @@ For example, given:
Then if you update the source version today, you should give it version `2019-06-01`. If you need to make a change which doesn't adjust the source version, you should give it version `2019-02-14-2`.
Example:
##### Examples:
```no-highlight
Version: 1.0.5-2
```
@ -71,7 +71,7 @@ A description of the library.
By convention the first line of the description is a summary of the library. An optional detailed description follows. The detailed description can be multiple lines, all starting with whitespace.
Example:
##### Examples:
```no-highlight
Description: C++ header-only JSON library
```
@ -96,17 +96,13 @@ Vcpkg does not distinguish between build-only dependencies and runtime dependenc
*For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies*
Example:
```no-highlight
Build-Depends: zlib, libpng, libjpeg-turbo, tiff
```
If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax.
If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax. If the port does not require any features from the dependency, this should be specifed as `portname[core]`.
Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name. There must be a space between the name of the port and the filter. __This will change in a future version to not depend on the triplet name.__
Dependencies can be filtered based on the target triplet to support differing requirements. These filters use the same syntax as the Supports field below and are surrounded in parentheses following the portname and feature list.
Example:
##### Example:
```no-highlight
Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx)
Build-Depends: rapidjson, curl[core,openssl] (!windows), curl[core,winssl] (windows)
```
#### Default-Features
@ -114,10 +110,46 @@ Comma separated list of optional port features to install by default.
This field is optional.
##### Example:
```no-highlight
Default-Features: dynamodb, s3, kinesis
```
<a name="Supports"></a>
#### Supports
Expression that evaluates to true when the port is expected to build successfully for a triplet.
Currently, this field is only used in the CI testing to skip ports. In the future, this mechanism is intended to warn users in advance that a given install tree is not expected to succeed. Therefore, this field should be used optimistically; in cases where a port is expected to succeed 10% of the time, it should still be marked "supported".
The grammar for the supports expression uses standard operators:
- `!expr` - negation
- `expr|expr` - or (`||` is also supported)
- `expr&expr` - and (`&&` is also supported)
- `(expr)` - grouping/precedence
The predefined expressions are computed from standard triplet settings:
- `x64` - `VCPKG_TARGET_ARCHITECTURE` == `"x64"`
- `x86` - `VCPKG_TARGET_ARCHITECTURE` == `"x86"`
- `arm` - `VCPKG_TARGET_ARCHITECTURE` == `"arm"` or `VCPKG_TARGET_ARCHITECTURE` == `"arm64"`
- `arm64` - `VCPKG_TARGET_ARCHITECTURE` == `"arm64"`
- `windows` - `VCPKG_CMAKE_SYSTEM_NAME` == `""` or `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"`
- `uwp` - `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"`
- `linux` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Linux"`
- `osx` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Darwin"`
- `android` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Android"`
- `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"`
These predefined expressions can be overridden in the triplet file via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option.
This field is optional and defaults to true.
> Implementers' Note: these terms are computed from the triplet via the `vcpkg_get_dep_info` mechanism.
##### Example:
```no-highlight
Supports: !(uwp|arm)
```
## Feature Paragraphs
Multiple optional features can be specified in the `CONTROL` files. It must have a `Feature` and `Description` field. It can optionally have a `Build-Depends` field. It must be separated from other paragraphs by one or more empty lines.

32
docs/users/triplets.md
View File

@ -2,20 +2,17 @@
Triplet is a standard term used in cross compiling as a way to completely capture the target environment (cpu, os, compiler, runtime, etc) in a single convenient name.
In Vcpkg, we use triplets to describe self-consistent builds of library sets. This means every library will be built using the same target cpu, OS, and compiler toolchain, but also CRT linkage and preferred library type.
In Vcpkg, we use triplets to describe an imaginary "target configuration set" for every library. Within a triplet, libraries are generally built with the same configuration, but it is not a requirement. For example, you could have one triplet that builds `openssl` statically and `zlib` dynamically, one that builds them both statically, and one that builds them both dynamically (all for the same target OS and architecture). A single build will consume files from a single triplet.
We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily add your own by creating a new file in the `triplets\` directory. The new triplet will immediately be available for use in commands, such as `vcpkg install boost:x86-windows-custom`.
To change the triplet used by your project, such as to enable static linking, see our [Integration Document](integration.md#triplet-selection).
## Community triplets
Triplets contained in the `triplets\community` folder are not tested by continuous integration.
Triplets contained in the `triplets\community` folder are not tested by continuous integration, but are commonly requested by the community.
These triplets contain configurations commonly requested by the community, but for which we lack the resources to properly test.
Port updates may break compatibility with community triplets, such regressions won't get caught by our testing pipelines. Because of this, community involvement is paramount!
Because we do not have continuous coverage, port updates may break compatibility with community triplets. Because of this, community involvement is paramount!
We will gladly accept and review contributions that aim to solve issues with these triplets.
@ -23,7 +20,7 @@ We will gladly accept and review contributions that aim to solve issues with the
Community Triplets are enabled by default, when using a community triplet a message like the following one will be printed during a package install:
```bash
```no-highlight
-- Using community triplet x86-uwp. This triplet configuration is not guaranteed to succeed.
-- [COMMUNITY] Loading triplet configuration from: D:\src\viromer\vcpkg\triplets\community\x86-uwp.cmake
```
@ -78,8 +75,29 @@ This option also has forms for configuration-specific and C flags:
- `VCPKG_C_FLAGS_DEBUG`
- `VCPKG_C_FLAGS_RELEASE`
<a name="VCPKG_DEP_INFO_OVERRIDE_VARS"></a>
### VCPKG_DEP_INFO_OVERRIDE_VARS
Replaces the default computed list of triplet "Supports" terms.
This option (if set) will override the default set of terms used for qualified dependency resolution and "Supports" field evaluation.
See the [`Supports`](../maintainers/control-files.md#Supports) control file field documentation for more details.
> Implementers' Note: this list is extracted via the `vcpkg_get_dep_info` mechanism.
## Windows Variables
### VCPKG_ENV_PASSTHROUGH
Instructs vcpkg to allow additional environment variables into the build process.
On Windows, vcpkg builds packages in a special clean environment that is isolated from the current command prompt to ensure build reliability and consistency.
This triplet option can be set to a list of additional environment variables that will be added to the clean environment.
See also the `vcpkg env` command for how you can inspect the precise environment that will be used.
> Implementers' Note: this list is extracted via the `vcpkg_get_tags` mechanism.
<a name="VCPKG_VISUAL_STUDIO_PATH"></a>
### VCPKG_VISUAL_STUDIO_PATH
Specifies the Visual Studio installation to use.

1
ports/abseil/CONTROL
View File

@ -5,3 +5,4 @@ Description: an open-source collection designed to augment the C++ standard libr
Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
Supports: !uwp

1
ports/ace/CONTROL
View File

@ -2,6 +2,7 @@ Source: ace
Version: 6.5.7-1
Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
Description: The ADAPTIVE Communication Environment
Supports: !uwp
Feature: wchar
Description: Enable extra wide char functions in ACE

1
ports/activemq-cpp/CONTROL
View File

@ -2,3 +2,4 @@ Source: activemq-cpp
Version: 3.9.5-1
Build-Depends: apr
Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.
Supports: !uwp

3
ports/akali/portfile.cmake
View File

@ -12,7 +12,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DAKALI_STATIC:BOOL=${AKALI_STATIC}
-DBUILD_TESTS:BOOL=OFF

1
ports/alac/CONTROL
View File

@ -2,3 +2,4 @@ Source: alac
Version: 2017-11-03-c38887c5-1
Homepage: https://github.com/macosforge/alac
Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.
Supports: !uwp

1
ports/aliyun-oss-c-sdk/CONTROL
View File

@ -2,3 +2,4 @@ Source: aliyun-oss-c-sdk
Version: 3.7.1-1
Description: Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.
Build-Depends: curl, apr-util
Supports: !uwp

1
ports/ampl-mp/CONTROL
View File

@ -1,3 +1,4 @@
Source: ampl-mp
Version: 2019-03-21-1
Description: An open-source library for mathematical programming
Supports: !uwp

1
ports/apr/CONTROL
View File

@ -2,6 +2,7 @@ Source: apr
Version: 1.6.5-3
Homepage: https://apr.apache.org/
Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
Supports: !uwp
Feature: private-headers
Description: Install non-standard files required for building Apache httpd

1
ports/arrow/CONTROL
View File

@ -3,3 +3,4 @@ Version: 0.15.1
Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser
Homepage: https://github.com/apache/arrow
Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
Supports: x64

4
ports/asiosdk/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: asiosdk
Version: 2.3.3
Homepage: https://www.steinberg.net/en/company/developers.html
Description: ASIO is a low latency audio API from Steinberg.

37
ports/asiosdk/Findasiosdk.cmake Normal file
View File

@ -0,0 +1,37 @@
if(WIN32)
else(WIN32)
message(FATAL_ERROR "Findasiosdk.cmake: Unsupported platform ${CMAKE_SYSTEM_NAME}" )
endif(WIN32)
find_path(
ASIOSDK_ROOT_DIR
asiosdk
)
if (NOT "${ASIOSDK_ROOT_DIR}" STREQUAL "")
set(ASIOSDK_ROOT_DIR
${ASIOSDK_ROOT_DIR}/asiosdk
)
endif()
find_path(ASIOSDK_INCLUDE_DIR
asio.h
PATHS
${ASIOSDK_ROOT_DIR}/common
)
if (NOT "${ASIOSDK_ROOT_DIR}" STREQUAL "")
set (ASIOSDK_INCLUDE_DIR
${ASIOSDK_ROOT_DIR}/common
${ASIOSDK_ROOT_DIR}/host
${ASIOSDK_ROOT_DIR}/hostpc
)
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ASIOSDK DEFAULT_MSG ASIOSDK_ROOT_DIR ASIOSDK_INCLUDE_DIR)
MARK_AS_ADVANCED(
ASIOSDK_ROOT_DIR ASIOSDK_INCLUDE_DIR
)

32
ports/asiosdk/portfile.cmake Normal file
View File

@ -0,0 +1,32 @@
vcpkg_fail_port_install(MESSAGE "asiosdk currently only supports Windows platforms" ON_ARCH "arm" "arm64" ON_TARGET "Linux" "OSX" "uwp")
set(VERSION 2.3.3)
vcpkg_download_distfile(ARCHIVE
URLS "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip"
FILENAME "asiosdk_2.3.3_2019-06-14.zip"
SHA512 65d6f2fa4f0e23939fcdf46ff3b04760089c0f14e2ac3e37e63cbf6733f3acc93ab930ea9e3f1eb60483d4654f7ba4699ed506531074c4f55e763ad92736c231
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${VERSION}
)
file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio)
file(INSTALL ${SOURCE_PATH}/common/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/common)
file(INSTALL ${SOURCE_PATH}/driver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/driver)
file(INSTALL ${SOURCE_PATH}/host/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/host)
file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk RENAME copyright)
file(INSTALL ${SOURCE_PATH}/changes.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Licensing Agreement.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
file(INSTALL "${SOURCE_PATH}/ASIO SDK 2.3.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/asiosdk)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

4
ports/asiosdk/usage Normal file
View File

@ -0,0 +1,4 @@
The package asiosdk provides CMake integration:
find_package(asiosdk REQUIRED)
target_include_directories(<my_target> PRIVATE ${ASIOSDK_INCLUDE_DIRS})

8
ports/asiosdk/vcpkg-cmake-wrapper.cmake Normal file
View File

@ -0,0 +1,8 @@
set(ASIOSDK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT ASIOSDK_INCLUDE_DIR)
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${ASIOSDK_PREV_MODULE_PATH})

4
ports/avro-c/CONTROL
View File

@ -1,5 +1,5 @@
Source: avro-c
Version: 1.8.2-3
Version: 1.8.2-4
Homepage: https://github.com/apache/avro
Description: Apache Avro is a data serialization system
Build-Depends: jansson, liblzma, zlib
Build-Depends: jansson, liblzma, zlib, snappy

2
ports/avro-c/portfile.cmake
View File

@ -12,13 +12,13 @@ vcpkg_from_github(
avro.patch
avro-pr-217.patch
fix-build-error.patch # Since jansson updated, use jansson::jansson instead of the macro ${JANSSON_LIBRARIES}
snappy.patch # https://github.com/apache/avro/pull/793
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/lang/c
PREFER_NINJA
OPTIONS
-DCMAKE_DISABLE_FIND_PACKAGE_Snappy=ON
)
vcpkg_install_cmake()

56
ports/avro-c/snappy.patch Normal file
View File

@ -0,0 +1,56 @@
diff -ru b/c/src/codec.c a/lang/c/src/codec.c
--- b/lang/c/src/codec.c 2020-01-23 16:18:15.119970300 +0200
+++ a/lang/c/src/codec.c 2020-01-23 19:31:41.679834300 +0200
@@ -21,6 +21,9 @@
# if defined(__APPLE__)
# include <libkern/OSByteOrder.h>
# define __bswap_32 OSSwapInt32
+# elif defined(_WIN32)
+# include <stdlib.h>
+# define __bswap_32 _byteswap_ulong
# else
# include <byteswap.h>
# endif
@@ -115,14 +118,14 @@
return 1;
}
- if (snappy_compress(data, len, c->block_data, &outlen) != SNAPPY_OK)
+ if (snappy_compress((const char *)data, len, (char*)c->block_data, &outlen) != SNAPPY_OK)
{
avro_set_error("Error compressing block with Snappy");
return 1;
}
- crc = __bswap_32(crc32(0, data, len));
- memcpy(c->block_data+outlen, &crc, 4);
+ crc = __bswap_32(crc32(0, (const Bytef *)data, len));
+ memcpy((char*)c->block_data+outlen, &crc, 4);
c->used_size = outlen+4;
return 0;
@@ -133,7 +136,7 @@
uint32_t crc;
size_t outlen;
- if (snappy_uncompressed_length(data, len-4, &outlen) != SNAPPY_OK) {
+ if (snappy_uncompressed_length((const char*)data, len-4, &outlen) != SNAPPY_OK) {
avro_set_error("Uncompressed length error in snappy");
return 1;
}
@@ -152,13 +155,13 @@
return 1;
}
- if (snappy_uncompress(data, len-4, c->block_data, &outlen) != SNAPPY_OK)
+ if (snappy_uncompress((const char*)data, len-4, (char*)c->block_data, &outlen) != SNAPPY_OK)
{
avro_set_error("Error uncompressing block with Snappy");
return 1;
}
- crc = __bswap_32(crc32(0, c->block_data, outlen));
+ crc = __bswap_32(crc32(0, (const Bytef *)c->block_data, outlen));
if (memcmp(&crc, (char*)data+len-4, 4))
{
avro_set_error("CRC32 check failure uncompressing block with Snappy");

3
ports/aws-c-common/CONTROL
View File

@ -1,3 +1,4 @@
Source: aws-c-common
Version: 0.4.1
Version: 0.4.15
Homepage: https://github.com/awslabs/aws-c-common
Description: AWS common library for C

30
ports/aws-c-common/disable-error-4068.patch
View File

@ -1,15 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 263d34e..8c699b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
endif()
+if (WIN32)
+ add_compile_options(/wd4068)
+endif()
+
aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79c66c3..f6639d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,6 +127,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
#this only gets applied to aws-c-common (not its consumers).
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
endif()
+
+if (WIN32)
+ add_compile_options(/wd4068)
+endif()
aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})

40
ports/aws-c-common/disable-internal-crt-option.patch
View File

@ -1,20 +1,20 @@
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
index 0f597d7..1359b8b 100644
--- a/cmake/AwsCFlags.cmake
+++ b/cmake/AwsCFlags.cmake
@@ -35,15 +35,6 @@ function(aws_set_common_properties target)
# /volatile:iso relaxes some implicit memory barriers that MSVC normally applies for volatile accesses
# Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
list(APPEND AWS_C_FLAGS /volatile:iso)
-
- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
- if(STATIC_CRT)
- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
- else()
- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
- endif()
- string(REPLACE " " ";" _FLAGS "${_FLAGS}")
- list(APPEND AWS_C_FLAGS "${_FLAGS}")
else()
list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
index 42d146e..813f56d 100644
--- a/cmake/AwsCFlags.cmake
+++ b/cmake/AwsCFlags.cmake
@@ -39,15 +39,6 @@ function(aws_set_common_properties target)
# Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
list(APPEND AWS_C_FLAGS /volatile:iso)
- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
- if(STATIC_CRT)
- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
- else()
- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
- endif()
- string(REPLACE " " ";" _FLAGS "${_FLAGS}")
- list(APPEND AWS_C_FLAGS "${_FLAGS}")
-
else()
list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)

28
ports/aws-c-common/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 433b6c5..41874a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,7 @@ else()
endif()
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake
index c322b52..6e5daa0 100644
--- a/cmake/aws-c-common-config.cmake
+++ b/cmake/aws-c-common-config.cmake
@@ -1,9 +1,5 @@
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

15
ports/aws-c-common/portfile.cmake
View File

@ -1,14 +1,13 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
REF b2e7ca47449571beaca4a507c65ac3ee39d8eefc
SHA512 c9dc394bf3ef8eb33d36b81bae5a2002a8fccc7d876ad9c631da818aae7d06846615791c2311e8baa6efa7fcd9d565effabfec6f01767ca0099c6fa64d58e2fa
REF e3e7ccd35a85f9cd38c67cb1988251f1543b6632 # v0.4.15
SHA512 f8be12628bb7503921bf64956697ad60ba1dc10099482515be7157a1f75b14fad716eadcf69af1d77a5f1bbdaf298a7913e678dd143c5b409dd37ce3bf57f023
HEAD_REF master
PATCHES
disable-error-4068.patch # This patch fixes dependency port compilation failure
disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
)
vcpkg_configure_cmake(
@ -29,9 +28,7 @@ file(REMOVE_RECURSE
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-common RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/share
)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/aws-c-event-stream/CONTROL
View File

@ -1,4 +1,4 @@
Source: aws-c-event-stream
Version: 0.1.1
Version: 0.1.4
Description: C99 implementation of the vnd.amazon.event-stream content-type.
Build-Depends: aws-c-common, aws-checksums

28
ports/aws-c-event-stream/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a765be0..4ade373 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ else()
endif()
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake
index 7bd3cfc..cb817e4 100644
--- a/cmake/aws-c-event-stream-config.cmake
+++ b/cmake/aws-c-event-stream-config.cmake
@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
find_dependency(aws-c-common)
find_dependency(aws-checksums)
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

15
ports/aws-c-event-stream/portfile.cmake
View File

@ -1,11 +1,10 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-event-stream
REF v0.1.1
SHA512 974311cdface59bb5a95c7c249ad31cf694ebefd5c7b25f280f6817c6dc8d9ab1fdc8f75030099efe573be41a93676f199fda797d2a7bb41533f7e15f05de120
REF 32713d30b479690d199b3f02163a832b09b309a5 #v0.1.4
SHA512 c1f776b708cd4a68afbcc60e046dcfa3f7c1d378e7bf49ba7f93b3db3a248218316e5037254709320cd50efd6486996aa09678f41499fcea810adea16463ff4b
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_configure_cmake(
@ -27,9 +26,7 @@ file(REMOVE_RECURSE
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-event-stream RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/share
)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/aws-checksums/CONTROL
View File

@ -1,3 +1,3 @@
Source: aws-checksums
Version: 0.1.3
Version: 0.1.5
Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.

25
ports/aws-checksums/fix-cmake-target-path.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ae2229..c4d0c2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,7 @@ else()
endif()
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
NAMESPACE AWS::)
configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
diff --git a/cmake/aws-checksums-config.cmake b/cmake/aws-checksums-config.cmake
index f0785bf..1b9b2d2 100644
--- a/cmake/aws-checksums-config.cmake
+++ b/cmake/aws-checksums-config.cmake
@@ -1,6 +1 @@
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
-endif()
-
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

15
ports/aws-checksums/portfile.cmake
View File

@ -1,11 +1,10 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-checksums
REF v0.1.3
SHA512 79bf71a6c4c268b27efe8a6a3c4b90281da4ce7f6e4c1c62fce80b11a4756ecfd4dc2b19624ace3f54137113d0cb56a517de0b91dd6338ee8ca069756bca13f4
REF 519d6d9093819b6cf89ffff589a27ef8f83d0f65 # v0.1.5
SHA512 3079786d106b98ba3b8c254c26ec4d9accf5fba5bcc13aed30ffa897e17ea7d701e6b6e903b37534e32e1cf0cac3e9a6ff46e1340ed7c530c2fc6262b245e05c
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
if (VCPKG_CRT_LINKAGE STREQUAL static)
@ -32,9 +31,7 @@ file(REMOVE_RECURSE
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-checksums RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/share
)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/aws-lambda-cpp/CONTROL
View File

@ -1,4 +1,4 @@
Source: aws-lambda-cpp
Version: 0.1.0-2
Version: 0.2.4
Build-Depends: curl
Description: C++ Runtime for AWS Lambda.

13
ports/aws-lambda-cpp/portfile.cmake
View File

@ -1,15 +1,10 @@
include(vcpkg_common_functions)
vcpkg_fail_port_install(MESSAGE "aws-lambda-cpp currently only supports Linux and Mac platforms" ON_TARGET "Windows")
#if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
# message(FATAL_ERROR "aws-lambda-cpp currently only supports Linux and Mac platforms")
#endif()
vcpkg_fail_port_install(ON_TARGET "Windows" "OSX")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-lambda-cpp
REF v0.1.0
SHA512 78b1ad1dcd88176a954c03b38cbb962c77488da6c75acb37a8b64cde147c030b02c6e51f0a974edb042e59c3c969d110d181ad097ef76f43255500b272a94454
REF 681652d9410bb4adb66e5afa9e8a3662a5f7b606 # v0.2.4
SHA512 c29ea2b8fb8b99a5d0a49f601406e14682e5133deeb871a750baa792becc91f22dac00c0ee3d8c056871a1f5035cdcd1a3bba3d9464dfa84e1ec00a270a9abd6
HEAD_REF master
)
@ -25,5 +20,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-lambda-cpp RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

4
ports/aws-sdk-cpp/CONTROL
View File

@ -1,5 +1,5 @@
Source: aws-sdk-cpp
Version: 1.7.142-1
Version: 1.7.214-1
Homepage: https://github.com/aws/aws-sdk-cpp
Description: AWS SDK for C++
Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
@ -51,7 +51,7 @@ Description: C++ SDK for the AWS autoscaling service
Feature: autoscaling-plans
Description: C++ SDK for the AWS autoscaling-plans service
Feature: AWSMigrationHub
Feature: awsmigrationhub
Description: C++ SDK for the AWS AWSMigrationHub service
Feature: awstransfer

2
ports/aws-sdk-cpp/compute_build_only.cmake
View File

@ -44,7 +44,7 @@ endif()
if("autoscaling-plans" IN_LIST FEATURES)
list(APPEND BUILD_ONLY autoscaling-plans)
endif()
if("AWSMigrationHub" IN_LIST FEATURES)
if("awsmigrationhub" IN_LIST FEATURES)
list(APPEND BUILD_ONLY AWSMigrationHub)
endif()
if("awstransfer" IN_LIST FEATURES)

15
ports/aws-sdk-cpp/portfile.cmake
View File

@ -1,12 +1,10 @@
include(vcpkg_common_functions)
vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
REF d3ee022fea02e8e7e02f3cdd77904dc4c39ab79a
SHA512 6f146830f15864bb3770ad50a6ebcbc478235e9c2c59aa044353bbfc297bf26437e07b77b970974cc294782809aaa837a3407cbc846426b04e97447cd7f9e3cf
REF e8a7e7263e900983921e95363026efaa494622ab # 1.7.214
SHA512 dc4e003ffaebf21410d8d360f8a4602dda99d3ee0c0ab7fb61c97fe8b5f0b38438ed5315fb85d3a435cd5a99724e43c5cf569a7cb365ed8137caeac32c619a86
HEAD_REF master
)
@ -16,14 +14,11 @@ set(BUILD_ONLY core)
include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
if(CMAKE_HOST_WIN32)
string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
else()
string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
endif()
string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DENABLE_UNITY_BUILD=ON
@ -83,4 +78,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/azure-c-shared-utility/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-c-shared-utility
Version: 2019-10-07.2-1
Version: 2020-01-22-1
Description: Azure C SDKs common code
Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c

248
ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch Normal file
View File

@ -0,0 +1,248 @@
diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake
index e85defa..7f450ab 100644
--- a/configs/azure_c_shared_utilityFunctions.cmake
+++ b/configs/azure_c_shared_utilityFunctions.cmake
@@ -2,11 +2,11 @@
#Licensed under the MIT license. See LICENSE file in the project root for full license information.
function(target_link_libraries_with_arg_prefix arg_prefix whatIsBuilding lib)
- if(${arg_prefix} STREQUAL "debug")
+ if(arg_prefix STREQUAL "debug")
target_link_libraries(${whatIsBuilding} debug ${lib})
- elseif(${arg_prefix} STREQUAL "optimized")
+ elseif(arg_prefix STREQUAL "optimized")
target_link_libraries(${whatIsBuilding} optimized ${lib})
- elseif(${arg_prefix} STREQUAL "general")
+ elseif(arg_prefix STREQUAL "general")
target_link_libraries(${whatIsBuilding} general ${lib})
else()
target_link_libraries(${whatIsBuilding} ${lib})
@@ -43,13 +43,13 @@ function(windows_unittests_add_dll whatIsBuilding)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -57,7 +57,7 @@ function(windows_unittests_add_dll whatIsBuilding)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})
@@ -90,13 +90,13 @@ function(windows_unittests_add_exe whatIsBuilding)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -104,7 +104,7 @@ function(windows_unittests_add_exe whatIsBuilding)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
@@ -150,14 +150,14 @@ function(linux_unittests_add_exe whatIsBuilding)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
set(skip_to_next TRUE)
#also unset all the other states
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -165,7 +165,7 @@ function(linux_unittests_add_exe whatIsBuilding)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
@@ -184,7 +184,7 @@ function(linux_unittests_add_exe whatIsBuilding)
if(${run_valgrind})
find_program(VALGRIND_FOUND NAMES valgrind)
- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)
+ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)
message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")
else()
add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)
@@ -307,13 +307,13 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -321,7 +321,7 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})
@@ -369,13 +369,13 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -383,7 +383,7 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
@@ -429,13 +429,13 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -443,7 +443,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
@@ -462,7 +462,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
if(${run_valgrind})
find_program(VALGRIND_FOUND NAMES valgrind)
- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)
+ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)
message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")
else()
add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --gen-suppressions=all --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)
@@ -546,29 +546,29 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)
(("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})
)
if (${use_cppunittest})
- if(${compileAsWhat} STREQUAL "C99")
+ if(compileAsWhat STREQUAL "C99")
compileTargetAsC99(${whatIsBuilding}_dll)
compileTargetAsC99(${whatIsBuilding}_testsonly_lib)
endif()
- if(${compileAsWhat} STREQUAL "C11")
+ if(compileAsWhat STREQUAL "C11")
compileTargetAsC11(${whatIsBuilding}_dll)
compileTargetAsC11(${whatIsBuilding}_testsonly_lib)
endif()
endif()
- if(${compileAsWhat} STREQUAL "C99")
+ if(compileAsWhat STREQUAL "C99")
compileTargetAsC99(${whatIsBuilding}_exe)
endif()
- if(${compileAsWhat} STREQUAL "C11")
+ if(compileAsWhat STREQUAL "C11")
compileTargetAsC11(${whatIsBuilding}_exe)
endif()
else()
if(
(("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${nuget_e2e_tests})
)
- if(${compileAsWhat} STREQUAL "C99")
+ if(compileAsWhat STREQUAL "C99")
compileTargetAsC99(${whatIsBuilding}_exe)
endif()
- if(${compileAsWhat} STREQUAL "C11")
+ if(compileAsWhat STREQUAL "C11")
compileTargetAsC11(${whatIsBuilding}_exe)
endif()
else()
@@ -581,10 +581,10 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)
(("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${run_e2e_tests}) OR
(("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})
)
- if(${compileAsWhat} STREQUAL "C99")
+ if(compileAsWhat STREQUAL "C99")
compileTargetAsC99(${whatIsBuilding}_exe)
endif()
- if(${compileAsWhat} STREQUAL "C11")
+ if(compileAsWhat STREQUAL "C11")
compileTargetAsC11(${whatIsBuilding}_exe)
endif()
endif()
@@ -641,8 +641,8 @@ function(set_platform_files c_shared_dir)
set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE)
endif()
if(use_etw)
- if(${use_etw} OR (${use_etw} STREQUAL "ON_WITH_CONSOLE"))
- if (${use_etw} STREQUAL "ON_WITH_CONSOLE")
+ if(use_etw OR (use_etw STREQUAL "ON_WITH_CONSOLE"))
+ if (use_etw STREQUAL "ON_WITH_CONSOLE")
set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE)
set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE)
set(LOGGING_RC_FILE ${c_shared_dir}/res/etwlogger.rc CACHE INTERNAL "")

256
ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch Normal file
View File

@ -0,0 +1,256 @@
diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake
index 6c2f415..e6133af 100644
--- a/configs/azure_c_shared_utilityFunctions.cmake
+++ b/configs/azure_c_shared_utilityFunctions.cmake
@@ -2,11 +2,11 @@
#Licensed under the MIT license. See LICENSE file in the project root for full license information.
function(target_link_libraries_with_arg_prefix arg_prefix whatIsBuilding lib)
- if(${arg_prefix} STREQUAL "debug")
+ if(arg_prefix STREQUAL "debug")
target_link_libraries(${whatIsBuilding} debug ${lib})
- elseif(${arg_prefix} STREQUAL "optimized")
+ elseif(arg_prefix STREQUAL "optimized")
target_link_libraries(${whatIsBuilding} optimized ${lib})
- elseif(${arg_prefix} STREQUAL "general")
+ elseif(arg_prefix STREQUAL "general")
target_link_libraries(${whatIsBuilding} general ${lib})
else()
target_link_libraries(${whatIsBuilding} ${lib})
@@ -43,13 +43,13 @@ function(windows_unittests_add_dll whatIsBuilding)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -57,7 +57,7 @@ function(windows_unittests_add_dll whatIsBuilding)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})
@@ -90,13 +90,13 @@ function(windows_unittests_add_exe whatIsBuilding)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -104,7 +104,7 @@ function(windows_unittests_add_exe whatIsBuilding)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
@@ -150,14 +150,14 @@ function(linux_unittests_add_exe whatIsBuilding)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
set(skip_to_next TRUE)
#also unset all the other states
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -165,7 +165,7 @@ function(linux_unittests_add_exe whatIsBuilding)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
@@ -184,7 +184,7 @@ function(linux_unittests_add_exe whatIsBuilding)
if(${run_valgrind})
find_program(VALGRIND_FOUND NAMES valgrind)
- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)
+ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)
message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")
else()
add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)
@@ -307,13 +307,13 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -321,7 +321,7 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})
@@ -369,13 +369,13 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -383,7 +383,7 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
@@ -429,13 +429,13 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
set(ARG_PREFIX "none")
foreach(f ${ARGN})
set(skip_to_next FALSE)
- if(${f} STREQUAL "ADDITIONAL_LIBS")
+ if(f STREQUAL "ADDITIONAL_LIBS")
SET(PARSING_ADDITIONAL_LIBS ON)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)
set(ARG_PREFIX "none")
#also unset all the other states
set(skip_to_next TRUE)
- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
+ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")
SET(PARSING_ADDITIONAL_LIBS OFF)
SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)
set(skip_to_next TRUE)
@@ -443,7 +443,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
if(NOT skip_to_next)
if(PARSING_ADDITIONAL_LIBS)
- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))
+ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))
SET(ARG_PREFIX ${f})
else()
target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})
@@ -462,7 +462,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)
if(${run_valgrind})
find_program(VALGRIND_FOUND NAMES valgrind)
- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)
+ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)
message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")
else()
add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --gen-suppressions=all --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)
@@ -546,29 +546,29 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)
(("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})
)
if (${use_cppunittest})
- if(${compileAsWhat} STREQUAL "C99")
+ if(compileAsWhat STREQUAL "C99")
compileTargetAsC99(${whatIsBuilding}_dll)
compileTargetAsC99(${whatIsBuilding}_testsonly_lib)
endif()
- if(${compileAsWhat} STREQUAL "C11")
+ if(compileAsWhat STREQUAL "C11")
compileTargetAsC11(${whatIsBuilding}_dll)
compileTargetAsC11(${whatIsBuilding}_testsonly_lib)
endif()
endif()
- if(${compileAsWhat} STREQUAL "C99")
+ if(compileAsWhat STREQUAL "C99")
compileTargetAsC99(${whatIsBuilding}_exe)
endif()
- if(${compileAsWhat} STREQUAL "C11")
+ if(compileAsWhat STREQUAL "C11")
compileTargetAsC11(${whatIsBuilding}_exe)
endif()
else()
if(
(("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${nuget_e2e_tests})
)
- if(${compileAsWhat} STREQUAL "C99")
+ if(compileAsWhat STREQUAL "C99")
compileTargetAsC99(${whatIsBuilding}_exe)
endif()
- if(${compileAsWhat} STREQUAL "C11")
+ if(compileAsWhat STREQUAL "C11")
compileTargetAsC11(${whatIsBuilding}_exe)
endif()
else()
@@ -581,10 +581,10 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)
(("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${run_e2e_tests}) OR
(("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})
)
- if(${compileAsWhat} STREQUAL "C99")
+ if(compileAsWhat STREQUAL "C99")
compileTargetAsC99(${whatIsBuilding}_exe)
endif()
- if(${compileAsWhat} STREQUAL "C11")
+ if(compileAsWhat STREQUAL "C11")
compileTargetAsC11(${whatIsBuilding}_exe)
endif()
endif()
@@ -641,15 +641,15 @@ function(set_platform_files c_shared_dir)
set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE)
endif()
- if(${use_etw} STREQUAL "OFF")
+ if(use_etw STREQUAL "OFF")
set(XLOGGING_C_FILE ${c_shared_dir}/src/xlogging.c PARENT_SCOPE)
set(LOGGING_C_FILE ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE)
set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/consolelogger.h PARENT_SCOPE)
- elseif(${use_etw} STREQUAL "TRACELOGGING")
+ elseif(use_etw STREQUAL "TRACELOGGING")
set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE)
set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c PARENT_SCOPE)
set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/etwlogger_driver.h PARENT_SCOPE)
- elseif(${use_etw} STREQUAL "TRACELOGGING_WITH_CONSOLE")
+ elseif(use_etw STREQUAL "TRACELOGGING_WITH_CONSOLE")
set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE)
set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE)
set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/etwlogger_driver.h ${c_shared_dir}/inc/azure_c_shared_utility/consolelogger.h PARENT_SCOPE)

8
ports/azure-c-shared-utility/portfile.cmake
View File

@ -9,14 +9,18 @@ if("public-preview" IN_LIST FEATURES)
REF 42574842914591aadc77701aac72f18cc72319ad
SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
HEAD_REF master
PATCHES
fix-utilityFunctions-conditions-preview.patch
)
else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-c-shared-utility
REF 42574842914591aadc77701aac72f18cc72319ad
SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
REF 48f7a556865731f0e96c47eb5e9537361f24647c
SHA512 c20074707e8601e090ee8daac1d96fdfb4f60ac60fd9c824dad81aa4c2f22b04733c82c01c1ae92110c26871b81674e8771d9ed65081f1c0c197a362275a28f1
HEAD_REF master
PATCHES
fix-utilityFunctions-conditions.patch
)
endif()

2
ports/azure-iot-sdk-c/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-iot-sdk-c
Version: 2019-11-27.1
Version: 2020-01-22
Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
Description: A C99 SDK for connecting devices to Microsoft Azure IoT services

4
ports/azure-iot-sdk-c/portfile.cmake
View File

@ -15,8 +15,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-iot-sdk-c
REF f8d260df190f90c04114ca8ff7d83dd03d4dd80d
SHA512 111331293cfbdbdac4a6460d293ec8650bee31940829852c27afc88cc6e742e96f71c996aa275dc5ed1f13e9fe19452d7b2685dde47bb7d6c135ebee58c50d21
REF a8a71c2d120c571a2d2ab6149863c2b075e7bea9
SHA512 bc9cae705bef7d9c5c33b80c1d564566058ae4e6bcd343d94df9d139d9f71e620da940c5dcf7ccdc16e75388a03ff3393b40fe603201938c7a37d60b938ca874
HEAD_REF master
PATCHES improve-external-deps.patch
)

2
ports/azure-kinect-sensor-sdk/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-kinect-sensor-sdk
Version: 1.4.0-alpha.0-1
Version: 1.4.0-alpha.0-2
Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK
Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.
Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv

26
ports/azure-kinect-sensor-sdk/fix-components-path.patch
View File

@ -1,26 +0,0 @@
diff --git a/src/record/sdk/CMakeLists.txt b/src/record/sdk/CMakeLists.txt
index 4be0697..d30c6de 100644
--- a/src/record/sdk/CMakeLists.txt
+++ b/src/record/sdk/CMakeLists.txt
@@ -81,7 +81,7 @@ install(
development
RUNTIME
DESTINATION
- ${CMAKE_INSTALL_BINDIR}
+ tools
COMPONENT
runtime
)
diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt
index 3616f40..a5019cb 100644
--- a/src/sdk/CMakeLists.txt
+++ b/src/sdk/CMakeLists.txt
@@ -90,7 +90,7 @@ install(
development
RUNTIME
DESTINATION
- ${CMAKE_INSTALL_BINDIR}
+ tools
COMPONENT
runtime
)

1
ports/azure-kinect-sensor-sdk/portfile.cmake
View File

@ -7,7 +7,6 @@ vcpkg_from_github(
PATCHES
fix-builds.patch
disable-c4275.patch
fix-components-path.patch
)
vcpkg_find_acquire_program(PYTHON3)

2
ports/azure-macro-utils-c/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-macro-utils-c
Version: 2019-11-27.1
Version: 2020-01-22
Description: A library of macros for the Azure IoT SDK Suite
Build-Depends:

4
ports/azure-macro-utils-c/portfile.cmake
View File

@ -14,8 +14,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-macro-utils-c
REF 7523af934fc4d9423111e358f49b19314ec9c3e3
SHA512 b53765096654fff9c5670004e4e107bffa81dd07e63eeac687c9e2b7e5ea2e1f26b6ae025c05c45f5c28152a457922f08c7f8d3303fa4d3b9194c34ba59533d5
REF 5926caf4e42e98e730e6d03395788205649a3ada
SHA512 97621f276657af976c4022c9600540ecae2287b3b386b9e097d661828a62c120348d354b3f86f3ef4d49f3c54830887662d3910ed5cec4a634949fa389b4ad55
HEAD_REF master
)
endif()

5
ports/azure-storage-cpp/CONTROL
View File

@ -1,6 +1,7 @@
Source: azure-storage-cpp
Version: 7.1.0
Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
Version: 7.1.0-1
Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext (osx)
Description: Microsoft Azure Storage Client SDK for C++
A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.
Homepage: https://blogs.msdn.com/b/windowsazurestorage/
Supports: !uwp

11
ports/azure-storage-cpp/portfile.cmake
View File

@ -1,8 +1,4 @@
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "${PORT} does not currently support UWP")
endif()
include(vcpkg_common_functions)
vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@ -19,7 +15,10 @@ vcpkg_configure_cmake(
-DCMAKE_FIND_FRAMEWORK=LAST
-DBUILD_TESTS=OFF
-DBUILD_SAMPLES=OFF
-DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/include
OPTIONS_RELEASE
-DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/lib
OPTIONS_DEBUG
-DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/debug/lib
)
vcpkg_install_cmake()

2
ports/azure-uamqp-c/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-uamqp-c
Version: 2019-11-27.1
Version: 2020-01-22
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
Description: AMQP library for C

4
ports/azure-uamqp-c/portfile.cmake
View File

@ -14,8 +14,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uamqp-c
REF 065ffdeeb47313ddbbc2a8e84ad52ab033e2e8d2
SHA512 bade6fae2d5479b7690632dbcc58bda5dd871eb0aa63d6a56cb35e81630121b5148309cd3414e6339c1218ec59fc12ac318b4964d295b579f7a0cacf5593b7ba
REF 142cfab9d66c6f81ea0cceb635f31e00cfa51c77
SHA512 80f95bc969c2e50124622561b5f939e981a8d317e3e9514e52ce020f0f20a125622bf914f16927edafc7ff3c878fb1d6a28f4f5e66bda52dcc8aa2dc34761f73
HEAD_REF master
)
endif()

2
ports/azure-uhttp-c/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-uhttp-c
Version: 2019-11-27.1
Version: 2020-01-22
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
Description: Azure HTTP Library written in C

4
ports/azure-uhttp-c/portfile.cmake
View File

@ -14,8 +14,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uhttp-c
REF d84a20609a2b5a555920389451fb3c9a2ed3656c
SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6
REF b67a6bfa0d018a8a23176ee214e46c208fc323c3
SHA512 75fafe242324bb2fc72befdd06427350e6f99aec9496fdf38b9660e7965fad89276ee543f36c3ba3360fc99b8301e74e2c1723d17f39e8471beee3e32cacb348
HEAD_REF master
)
endif()

2
ports/azure-umqtt-c/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-umqtt-c
Version: 2019-11-27.1
Version: 2020-01-22
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
Description: General purpose library for communication over the mqtt protocol

4
ports/azure-umqtt-c/portfile.cmake
View File

@ -14,8 +14,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-umqtt-c
REF 7557db6de094b67818d3c410dc95a3cf07cd86a6
SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40
REF 65cdd1013715fb9d208c42f957eb353fbe22bafb
SHA512 8cd33dcde966132e2aa0c6d931e75f9bcdc5734d57d8f6bb8a922711b0b63c2f0e58d379fe92371886387dfbb0b8c117b512873363eb76cf22fa985dbf11d52e
HEAD_REF master
)
endif()

1
ports/benchmark/CONTROL
View File

@ -2,3 +2,4 @@ Source: benchmark
Version: 1.5
Homepage: https://github.com/google/benchmark
Description: A library to support the benchmarking of functions, similar to unit-tests.
Supports: !uwp

1
ports/berkeleydb/CONTROL
View File

@ -2,3 +2,4 @@ Source: berkeleydb
Version: 4.8.30-3
Homepage: https://download.oracle.com/
Description: BDB - A high-performance embedded database for key/value data.
Supports: !uwp

1
ports/c-ares/CONTROL
View File

@ -2,3 +2,4 @@ Source: c-ares
Version: 2019-5-2-1
Homepage: https://github.com/c-ares/c-ares
Description: A C library for asynchronous DNS requests
Supports: !uwp

1
ports/caffe2/CONTROL
View File

@ -3,3 +3,4 @@ Version: 0.8.1-3
Build-Depends: lmdb, gflags, glog, eigen3, protobuf
Homepage: https://github.com/caffe2/caffe2
Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.
Supports: !x86

1
ports/capnproto/CONTROL
View File

@ -3,3 +3,4 @@ Version: 0.7.0-3
Description: Data interchange format and capability-based RPC system
Homepage: https://capnproto.org/
Build-Depends: zlib
Supports: !uwp

2
ports/cgal/CONTROL
View File

@ -1,5 +1,5 @@
Source: cgal
Version: 5.0
Version: 5.0.1
Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision
Homepage: https://github.com/CGAL/cgal
Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.

4
ports/cgal/portfile.cmake
View File

@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CGAL/cgal
REF releases/CGAL-5.0
SHA512 c7462f1f5ca1ef154a3a20ce4c1b63e544ad7e62ea0afb9aee99872402362fa2001a52740d62ac779e75f1354ad9c955a895f3cad12186e3b75d91f0f3452847
REF releases/CGAL-5.0.1
SHA512 656e207bdc7003dd2e3e4b31b33f9ac3af5074e4892dda645f67fccdc0ac22982d8bf3c62f9c556847ba0447c14f79923712fc6320f8c10ea77e17bf77eb3e2f
HEAD_REF master
)

1
ports/civetweb/CONTROL
View File

@ -1,3 +1,4 @@
Source: civetweb
Version: 2019-07-05
Description: Easy to use, powerful, C/C++ embeddable web server.
Supports: !uwp

3
ports/coroutine/CONTROL
View File

@ -1,4 +1,5 @@
Source: coroutine
Version: 1.4.3
Version: 2020-01-13
Build-Depends: ms-gsl
Description: C++ coroutine helper/example library
Supports: !x86

5
ports/coroutine/portfile.cmake
View File

@ -4,12 +4,11 @@ if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead. If it is critical, create an issue at the repo: github.com/luncliff/coroutine")
endif()
# changed to 1.4.2
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO luncliff/coroutine
REF 74467cb470a6bf8b9559a56ebdcb68ff915d871e
SHA512 5d61a23c5fe33c544943659dedecff487bb20f288f9c99f137f37bb777317672f299599b740e53cae42c355595fdfdffe183ade39e828b1f3b4aa821a47cb50e
REF fcd970807e9a47c250c1a4e06c7dc6d93079b684
SHA512 517f1c1726e4adc36cd34379c545324c99861d7cb5ebd3cebe0b7132fe5b61969a00e405bc106bb8f089f37d3a7ca9b1bcdc665a5cd6dfcaaf6856be37bec5b0
HEAD_REF master
)

1
ports/cpp-netlib/CONTROL
View File

@ -3,3 +3,4 @@ Version: 0.13.0-3
Homepage: https://cpp-netlib.org/
Build-Depends: boost
Description: A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library
Supports: !uwp

1
ports/cppfs/CONTROL
View File

@ -1,6 +1,7 @@
Source: cppfs
Version: 1.2.0-1
Description: Cross-platform C++ file system library supporting multiple backends
Supports: !uwp
Feature: ssh
Description: SSH backend for cppfs

2
ports/cppitertools/CONTROL
View File

@ -1,4 +1,4 @@
Source: cppitertools
Version: 2019-04-14-2
Version: 2019-04-14-3
Description: Range-based for loop add-ons inspired by the Python builtins and itertools library
Build-Depends: boost-optional

8
ports/cppitertools/portfile.cmake
View File

@ -1,7 +1,3 @@
# header-only library
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ryanhaining/cppitertools
@ -13,8 +9,8 @@ vcpkg_from_github(
file(GLOB INCLUDE_FILES ${SOURCE_PATH}/*.hpp)
file(GLOB INCLUDE_INTERNAL_FILES ${SOURCE_PATH}/internal/*.hpp)
file(COPY ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(COPY ${INCLUDE_INTERNAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/internal)
file(COPY ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cppitertools)
file(COPY ${INCLUDE_INTERNAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cppitertools/internal)
# Handle copyright
configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

1
ports/cudnn/CONTROL
View File

@ -2,3 +2,4 @@ Source: cudnn
Version: 7.6
Description: NVIDIA's cuDNN deep neural network acceleration library
Build-Depends: cuda
Supports: (windows|linux)&x64

1
ports/darknet/CONTROL
View File

@ -2,6 +2,7 @@ Source: darknet
Version: 0.2.5.1-1
Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.
Build-Depends: pthreads (windows), stb
Supports: !(arm|uwp)
Feature: cuda
Build-Depends: cuda

3
ports/dirent/portfile.cmake
View File

@ -3,7 +3,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
return()
endif()
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tronkko/dirent
@ -14,3 +13,5 @@ vcpkg_from_github(
file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/dirent RENAME copyright)
vcpkg_copy_pdbs()
set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)

3
ports/dlfcn-win32/portfile.cmake
View File

@ -1,4 +1,3 @@
include(vcpkg_common_functions)
set(SOURCE_VERSION 1.1.1)
vcpkg_from_github(
@ -27,3 +26,5 @@ vcpkg_copy_pdbs()
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)

1
ports/dmlc/CONTROL
View File

@ -3,6 +3,7 @@ Version: 2019-08-12-1
Homepage: https://github.com/dmlc/dmlc-core
Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
Default-Features: openmp
Supports: !uwp
Feature: openmp
Description: Build with openmp

2
ports/dpdk/CONTROL
View File

@ -1,4 +1,4 @@
Source: dpdk
Version: 19.02
Description: A set of libraries and drivers for fast packet processing
Supports: linux

3
ports/easyhook/CONTROL
View File

@ -1,4 +1,5 @@
Source: easyhook
Version: 2.7.6789.0
Homepage: https://github.com/EasyHook/EasyHook
Description: This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.
Description: This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.
Supports: windows

1
ports/ebml/CONTROL
View File

@ -2,3 +2,4 @@ Source: ebml
Version: 1.3.9
Homepage: https://github.com/Matroska-Org/libebml
Description: a C++ libary to parse EBML files
Supports: !uwp

4
ports/eigen3/CONTROL
View File

@ -1,4 +1,4 @@
Source: eigen3
Version: 3.3.7-3
Homepage: https://bitbucket.org/eigen/eigen
Version: 3.3.7-4
Homepage: http://eigen.tuxfamily.org
Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.

7
ports/eigen3/portfile.cmake
View File

@ -2,11 +2,12 @@ include(vcpkg_common_functions)
vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com
OUT_SOURCE_PATH SOURCE_PATH
REPO eigenteam/eigen-git-mirror
REPO libeigen/eigen
REF 3.3.7
SHA512 270ab9b5c22e09aa0e70d1a26995523c5c21fb0f09da45c137c11ab4c7700fe2bdb2b343c1e063bea4be5ae61d2313ff29ebbcad519dc355a568792b4a6e9e48
SHA512 4cc3717b9cbe78335e05f724919497214edd482d4812aeb1a9fd6da5b3f6d1b194bb93ed0dab9e734b4334a5b88e8f8c339c43c1b2044332286ef5e758f9ecf4
HEAD_REF master
)

1
ports/expat/CONTROL
View File

@ -2,3 +2,4 @@ Source: expat
Version: 2.2.7
Homepage: https://github.com/libexpat/libexpat
Description: XML parser library written in C
Supports: !uwp

38
ports/fftw3/aligned_malloc.patch Normal file
View File

@ -0,0 +1,38 @@
diff --git a/cmake.config.h.in b/cmake.config.h.in
index 1f4c505..fd763cc 100644
--- a/cmake.config.h.in
+++ b/cmake.config.h.in
@@ -112,6 +112,10 @@
you don't. */
#cmakedefine01 HAVE_DECL_POSIX_MEMALIGN
+/* Define to 1 if you have the declaration of `_aligned_malloc', and to 0 if you
+ don't. */
+#cmakedefine01 HAVE_DECL_ALIGNED_MALLOC
+
/* Define to 1 if you have the declaration of `sinl', and to 0 if you don't.
*/
#cmakedefine01 HAVE_DECL_SINL
@@ -184,6 +188,9 @@
/* Define to 1 if you have the `memalign' function. */
#cmakedefine HAVE_MEMALIGN 1
+/* Define to 1 if you have the `_aligned_malloc' function. */
+#cmakedefine HAVE_ALIGNED_MALLOC 1
+
/* Define to 1 if you have the `memmove' function. */
#cmakedefine HAVE_MEMMOVE 1
diff --git a/kernel/kalloc.c b/kernel/kalloc.c
index e42f6f3..ffc2257 100644
--- a/kernel/kalloc.c
+++ b/kernel/kalloc.c
@@ -103,7 +103,7 @@ void *X(kernel_malloc)(size_t n)
# undef real_free
# define real_free _mm_free
-# elif defined(_MSC_VER)
+# elif defined(_MSC_VER) || defined (HAVE_ALIGNED_MALLOC)
/* MS Visual C++ 6.0 with a "Processor Pack" supports SIMD
and _aligned_malloc/free (uses malloc.h) */
p = (void *) _aligned_malloc(n, MIN_ALIGNMENT);

17
ports/fftw3/fftw3_arch_fix.patch
View File

@ -2,6 +2,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95bd537a..245acc8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,8 @@
check_prototype_definition (sinl "long double sinl( long double arg )" "0" math.h HAVE_DECL_SINL)
check_prototype_definition (memalign "void *memalign(size_t alignment, size_t size)" "0" malloc.h HAVE_DECL_MEMALIGN)
check_prototype_definition (posix_memalign "int posix_memalign(void **memptr, size_t alignment, size_t size)" "0" stdlib.h HAVE_DECL_POSIX_MEMALIGN)
+check_prototype_definition (_aligned_malloc "void* __cdecl _aligned_malloc(size_t _Size, size_t _Alignment)" "0" malloc.h HAVE_DECL_ALIGNED_MALLOC)
+
include (CheckSymbolExists)
check_symbol_exists (clock_gettime time.h HAVE_CLOCK_GETTIME)
@@ -75,6 +77,7 @@
check_symbol_exists (srand48 stdlib.h HAVE_SRAND48)
check_symbol_exists (memalign malloc.h HAVE_MEMALIGN)
check_symbol_exists (posix_memalign stdlib.h HAVE_POSIX_MEMALIGN)
+check_symbol_exists (_aligned_malloc malloc.h HAVE_ALIGNED_MALLOC)
check_symbol_exists (mach_absolute_time mach/mach_time.h HAVE_MACH_ABSOLUTE_TIME)
check_symbol_exists (alloca alloca.h HAVE_ALLOCA)
if (NOT HAVE_ALLOCA)
@@ -131,6 +131,7 @@ endif ()
include (CheckCCompilerFlag)

62
ports/fftw3/portfile.cmake
View File

@ -13,50 +13,19 @@ vcpkg_extract_source_archive_ex(
omp_test.patch
patch_targets.patch
fftw3_arch_fix.patch
aligned_malloc.patch
)
if ("openmp" IN_LIST FEATURES)
set(ENABLE_OPENMP ON)
else()
set(ENABLE_OPENMP OFF)
endif()
if ("avx" IN_LIST FEATURES)
set(HAVE_AVX ON)
set(HAVE_SSE ON)
set(HAVE_SSE2 ON)
else()
set(HAVE_AVX OFF)
endif()
if ("avx2" IN_LIST FEATURES)
set(HAVE_AVX2 ON)
set(HAVE_FMA ON)
set(HAVE_SSE ON)
set(HAVE_SSE2 ON)
else()
set(HAVE_AVX2 OFF)
set(HAVE_FMA OFF)
endif()
if ("sse" IN_LIST FEATURES)
set(HAVE_SSE ON)
else()
set(HAVE_SSE OFF)
endif()
if ("sse2" IN_LIST FEATURES)
set(HAVE_SSE2 ON)
set(HAVE_SSE ON)
else()
set(HAVE_SSE2 OFF)
endif()
if ("threads" IN_LIST FEATURES)
set(HAVE_THREADS ON)
else()
set(HAVE_THREADS OFF)
endif()
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
openmp ENABLE_OPENMP
threads ENABLE_THREADS
threads WITH_COMBINED_THREADS
avx2 ENABLE_AVX2
avx ENABLE_AVX
sse2 ENABLE_SSE2
sse ENABLE_SSE
)
set(ENABLE_FLOAT_CMAKE fftw3f)
set(ENABLE_LONG_DOUBLE_CMAKE fftw3l)
@ -80,14 +49,7 @@ foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
PREFER_NINJA
OPTIONS
-D${PRECISION}=ON
-DENABLE_OPENMP=${ENABLE_OPENMP}
-DHAVE_SSE=${HAVE_SSE}
-DHAVE_SSE2=${HAVE_SSE2}
-DHAVE_AVX=${HAVE_AVX}
-DHAVE_AVX2=${HAVE_AVX2}
-DHAVE_FMA=${HAVE_FMA}
-DENABLE_THREADS=${HAVE_THREADS}
-DWITH_COMBINED_THREADS=${HAVE_THREADS}
${FEATURE_OPTIONS}
-DBUILD_TESTS=OFF
)
endif()

1
ports/field3d/CONTROL
View File

@ -3,3 +3,4 @@ Version: 1.7.2
Homepage: https://github.com/imageworks/Field3D
Description: An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk.
Build-Depends: hdf5, boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format
Supports: !(windows|arm|uwp)

6
ports/fizz/CONTROL
View File

@ -1,4 +1,4 @@
Source: fizz
Version: 2019.10.28.00
Build-Depends: folly, openssl, libsodium, zlib
Description: a TLS 1.3 implementation by Facebook
Version: 2020.01.20.00
Build-Depends: folly, openssl, libsodium, zlib, fmt
Description: a TLS 1.3 implementation by Facebook

26
ports/fizz/fix-build_error.patch
View File

@ -1,13 +1,13 @@
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
index 7f8769a..debac4e 100644
--- a/fizz/CMakeLists.txt
+++ b/fizz/CMakeLists.txt
@@ -81,7 +81,7 @@ if(TARGET event)
message(STATUS "Found libevent from package config")
list(APPEND FIZZ_SHINY_DEPENDENCIES event)
else()
- find_package(Libevent MODULE REQUIRED)
+ find_package(Libevent CONFIG REQUIRED)
list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
endif()
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
index ccbbbb6..ee10c90 100644
--- a/fizz/CMakeLists.txt
+++ b/fizz/CMakeLists.txt
@@ -86,7 +86,7 @@ if(TARGET event)
message(STATUS "Found libevent from package config")
list(APPEND FIZZ_SHINY_DEPENDENCIES event)
else()
- find_package(Libevent MODULE REQUIRED)
+ find_package(Libevent CONFIG REQUIRED)
list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
endif()

6
ports/fizz/portfile.cmake
View File

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
REF 3e933cff04c27c97d0fb0b899ed0c883b4e02e3b # v2019.10.28.00
SHA512 522b677f9e6cb0dd7ce2dad226efd831877ce12352efa6a34e743d1ec7a02ba65e7425472a57e88832f68fa4503206d9846580e305da6a0843034455e510b68d
REF b5c90de055e58e53b4137e0593f5bdbca172bcb2 # v2020.01.20.00
SHA512 1fdc8fd1d48671de30e4e67d260b13045dbc4436d2afa571bbb60e446d7d47cb68b9536dfef3621c0dd104abb7ec24647e0e0fad42b0134c5047772b7a9b2384
HEAD_REF master
PATCHES
find-zlib.patch
@ -44,4 +44,4 @@ file(REMOVE_RECURSE
)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fizz RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

1
ports/folly/CONTROL
View File

@ -4,6 +4,7 @@ Homepage: https://github.com/facebook/folly
Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr
Default-Features: zlib
Supports: x64
Feature: zlib
Build-Depends: zlib

1
ports/forge/CONTROL
View File

@ -2,3 +2,4 @@ Source: forge
Version: 1.0.4-2
Description: Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.
Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
Supports: x64

8
ports/freeglut/portfile.cmake
View File

@ -49,8 +49,12 @@ vcpkg_install_cmake()
# Rename static lib (otherwise it's incompatible with FindGLUT.cmake)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglutd.lib)
if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib)
endif()
if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglutd.lib)
endif()
endif()
vcpkg_replace_string(

17
ports/freetype/CONTROL
View File

@ -1,5 +1,18 @@
Source: freetype
Version: 2.10.1-2
Build-Depends: zlib, bzip2, libpng
Version: 2.10.1-3
Build-Depends: zlib
Homepage: https://www.freetype.org/
Description: A library to render fonts.
Default-Features: bzip2, png
Feature: bzip2
Build-Depends: bzip2
Description: Support bzip2 compressed fonts.
Feature: harfbuzz
Build-Depends: harfbuzz
Description: Improve auto-hinting of OpenType fonts.
Feature: png
Build-Depends: libpng
Description: Support PNG compressed OpenType embedded bitmaps.

52
ports/freetype/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
set(FT_VERSION 2.10.1)
vcpkg_download_distfile(ARCHIVE
URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.xz" "https://downloads.sourceforge.net/project/freetype/freetype2/${FT_VERSION}/freetype-${FT_VERSION}.tar.xz"
@ -8,20 +6,31 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${FT_VERSION}
PATCHES
0001-Fix-install-command.patch
0002-Add-CONFIG_INSTALL_PATH-option.patch
0003-Fix-UWP.patch
0005-Fix-DLL-EXPORTS.patch
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${FT_VERSION}
PATCHES
0001-Fix-install-command.patch
0002-Add-CONFIG_INSTALL_PATH-option.patch
0003-Fix-UWP.patch
0005-Fix-DLL-EXPORTS.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
bzip2 FT_WITH_BZIP2
harfbuzz FT_WITH_HARFBUZZ
png FT_WITH_PNG
INVERTED_FEATURES
bzip2 CMAKE_DISABLE_FIND_PACKAGE_BZip2
harfbuzz CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz
png CMAKE_DISABLE_FIND_PACKAGE_PNG
)
if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic")
set(ENABLE_DLL_EXPORT OFF)
set(ENABLE_DLL_EXPORT OFF)
else()
set(ENABLE_DLL_EXPORT ON)
set(ENABLE_DLL_EXPORT ON)
endif()
vcpkg_configure_cmake(
@ -29,11 +38,8 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DCONFIG_INSTALL_PATH=share/freetype
-DFT_WITH_ZLIB=ON
-DFT_WITH_BZIP2=ON
-DFT_WITH_PNG=ON
-DFT_WITH_HARFBUZZ=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-DFT_WITH_ZLIB=ON # Force system zlib.
${FEATURE_OPTIONS}
-DENABLE_DLL_EXPORT=${ENABLE_DLL_EXPORT}
)
@ -78,5 +84,13 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/freetype/LICENSE.TXT ${CURRENT_PACKAGE
vcpkg_copy_pdbs()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/freetype)
if("bzip2" IN_LIST FEATURES)
set(USE_BZIP2 ON)
endif()
if("png" IN_LIST FEATURES)
set(USE_PNG ON)
endif()
configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/freetype/vcpkg-cmake-wrapper.cmake @ONLY)
endif()

33
ports/freetype/vcpkg-cmake-wrapper.cmake
View File

@ -1,10 +1,35 @@
_find_package(${ARGS})
find_package(ZLIB)
find_package(PNG)
find_package(BZip2)
if(@USE_BZIP2@)
find_package(BZip2)
endif()
if(@USE_PNG@)
find_package(PNG)
endif()
if(TARGET Freetype::Freetype)
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2 PNG::PNG ZLIB::ZLIB)
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
if(@USE_BZIP2@)
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2)
endif()
if(@USE_PNG@)
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG)
endif()
endif()
if(FREETYPE_LIBRARIES)
list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES})
if(@USE_BZIP2@)
list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES})
endif()
if(@USE_PNG@)
list(APPEND FREETYPE_LIBRARIES ${PNG_LIBRARIES})
endif()
endif()

30
ports/ftgl/01_disable_doxygen.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 303fcae..718ae88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,15 +35,16 @@ ENDIF(BUILD_SHARED_LIBS)
ADD_CUSTOM_TARGET(doc)
-FIND_PACKAGE(Doxygen)
-IF(DOXYGEN_FOUND)
- ADD_CUSTOM_TARGET(doxygen
- ${DOXYGEN_EXECUTABLE}
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- COMMENT "Doxygen ...")
- ADD_DEPENDENCIES(doc doxygen)
-
-ENDIF(DOXYGEN_FOUND)
+IF (WIN32) # doxygen only have windows package in vcpkg now.
+ FIND_PACKAGE(Doxygen)
+ IF(DOXYGEN_FOUND)
+ ADD_CUSTOM_TARGET(doxygen
+ ${DOXYGEN_EXECUTABLE}
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ COMMENT "Doxygen ...")
+ ADD_DEPENDENCIES(doc doxygen)
+ ENDIF(DOXYGEN_FOUND)
+ENDIF()
SUBDIRS(src)

14
ports/ftgl/02_enable-cpp11-std.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 718ae88..e53e0da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(FTGL)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
SET(CMAKE_MODULE_PATH ${FTGL_SOURCE_DIR})
SET(VERSION_SERIES 2)

13
ports/ftgl/CONTROL
View File

@ -1,6 +1,7 @@
Source: ftgl
Version: 2.4.0-1
Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.
Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.
FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering.
Build-Depends: freetype, opengl
Source: ftgl
Version: 2.4.0-2
Homepage: https://github.com/frankheckenbach/ftgl
Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.
Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.
FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering.
Build-Depends: freetype, opengl

55
ports/ftgl/portfile.cmake
View File

@ -1,25 +1,32 @@
include(vcpkg_common_functions)
vcpkg_find_acquire_program(DOXYGEN)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO frankheckenbach/ftgl
if (VCPKG_TARGET_IS_WINDOWS)
# doxygen only have windows package in vcpkg now.
vcpkg_find_acquire_program(DOXYGEN)
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO frankheckenbach/ftgl
REF 483639219095ad080538e07ceb5996de901d4e74
SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f
HEAD_REF master
PATCHES Fix-headersFilePath.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
vcpkg_test_cmake(PACKAGE_NAME FTGL)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ftgl)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/ftgl/COPYING ${CURRENT_PACKAGES_DIR}/share/ftgl/copyright)
SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f
HEAD_REF master
PATCHES
Fix-headersFilePath.patch
01_disable_doxygen.patch
02_enable-cpp11-std.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()
if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
else ()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

1
ports/getopt-win32/CONTROL
View File

@ -2,3 +2,4 @@ Source: getopt-win32
Version: 0.1
Description: An implementation of getopt.
Homepage: https://github.com/libimobiledevice-win32
Supports: windows

4
ports/getopt-win32/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
if(VCPKG_CMAKE_SYSTEM_NAME)
message(FATAL_ERROR "getopt-win32 only supports building on Windows Desktop")
endif()
@ -22,3 +20,5 @@ vcpkg_install_msbuild(
# Copy header
file(COPY ${SOURCE_PATH}/getopt.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)

1
ports/getopt/CONTROL
View File

@ -2,3 +2,4 @@ Source: getopt
Version: 0
Description: The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.
Build-Depends: getopt-win32 (windows)
Supports: !uwp

60
ports/gettext/0003-Fix-win-unicode-paths.patch Normal file
View File

@ -0,0 +1,60 @@
diff --git "a/gettext-runtime/intl/loadmsgcat.c" "b/gettext-runtime/intl/loadmsgcat.c"
index 63351523..c078de3f 100644
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -477,6 +477,55 @@ char *alloca ();
# define munmap(addr, len) __munmap (addr, len)
#endif
+#ifdef _WIN32
+/* Provide wrapper of "open" for Windows that supports UTF-8 filenames. */
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# endif
+# ifndef WIN32_EXTRA_LEAN
+# define WIN32_EXTRA_LEAN
+# endif
+# undef NOMINMAX
+# define NOMINMAX
+# include <Windows.h> // For: MultiByteToWideChar
+# include <io.h>
+# include <wchar.h>
+
+int _open_utf8_windows_wrapper(
+ const char *filename,
+ int flags
+)
+{
+ int wstr_len = -1;
+ wchar_t* pUtf16FileName = NULL;
+ int fh = -1;
+
+ // on Windows, convert the filename from UTF-8 to UTF-16
+ wstr_len = MultiByteToWideChar(CP_UTF8, 0, filename, -1, NULL, 0);
+ if (wstr_len <= 0)
+ {
+ // MultiByteToWideChar failed
+ errno = ENOENT;
+ return -1;
+ }
+ pUtf16FileName = malloc(wstr_len * sizeof(wchar_t));
+ if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, pUtf16FileName, wstr_len) == 0)
+ {
+ // MultiByteToWideChar failed
+ free(pUtf16FileName);
+ errno = ENOENT;
+ return -1;
+ }
+
+ // and call _wopen
+ fh = _wopen(pUtf16FileName, flags);
+
+ free(pUtf16FileName);
+ return fh;
+}
+# define open(name, flags) _open_utf8_windows_wrapper(name, flags)
+#endif // #ifdef _WIN32
+
/* For those losing systems which don't have `alloca' we have to add
some additional code emulating it. */
#ifdef HAVE_ALLOCA

Some files were not shown because too many files have changed in this diff Show More