diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-03-09 09:19:05 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-03-09 09:19:05 -0700 |
| commit | 6b55c62144b120f3c5fc0d3cd8163f309241a18a (patch) | |
| tree | 125aa435dff79db545fc4b08ab0c3cb537bc725c | |
| parent | e21400c7cae2c2df3a9dce6ef8e3c4bf7109aaac (diff) | |
| parent | d0b1f2a9e8ed1ea53d181d13c69e15cf775148db (diff) | |
| download | vcpkg-6b55c62144b120f3c5fc0d3cd8163f309241a18a.tar.gz vcpkg-6b55c62144b120f3c5fc0d3cd8163f309241a18a.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
264 files changed, 4250 insertions, 3055 deletions
diff --git a/.gitignore b/.gitignore index 297819bf4..0b320879b 100644 --- a/.gitignore +++ b/.gitignore @@ -291,7 +291,6 @@ __pycache__/ /toolsrc/msbuild.x86.release/ /toolsrc/msbuild.x64.debug/ /toolsrc/msbuild.x64.release/ -#ignore custom triplets /triplets/* #add vcpkg-designed triplets back in !triplets/community/arm64-mingw.cmake @@ -299,9 +298,11 @@ __pycache__/ !triplets/community/arm-mingw.cmake !triplets/community/arm-windows.cmake !triplets/community/x64-mingw.cmake +!triplets/community/x64-windows-static-md.cmake !triplets/community/x86-mingw.cmake !triplets/community/x86-uwp.cmake !triplets/community/x86-windows-static.cmake +!triplets/community/x86-windows-static-md.cmake !triplets/arm-uwp.cmake !triplets/x64-uwp.cmake !triplets/x64-windows.cmake @@ -310,6 +311,7 @@ __pycache__/ !triplets/arm64-windows.cmake !triplets/x64-linux.cmake !triplets/x64-osx.cmake +#ignore custom triplets *.exe *.zip diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 9ff16fd96..776ffdefc 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -15,6 +15,7 @@ - [vcpkg\_common\_definitions](vcpkg_common_definitions.md)
- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md)
- [vcpkg\_configure\_make](vcpkg_configure_make.md)
+- [vcpkg\_configure\_meson](vcpkg_configure_meson.md)
- [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)
- [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md)
- [vcpkg\_download\_distfile](vcpkg_download_distfile.md)
@@ -24,12 +25,14 @@ - [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md)
- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md)
- [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md)
+- [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md)
- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md)
- [vcpkg\_from\_git](vcpkg_from_git.md)
- [vcpkg\_from\_github](vcpkg_from_github.md)
- [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md)
- [vcpkg\_install\_cmake](vcpkg_install_cmake.md)
- [vcpkg\_install\_make](vcpkg_install_make.md)
+- [vcpkg\_install\_meson](vcpkg_install_meson.md)
- [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md)
- [vcpkg\_install\_nmake](vcpkg_install_nmake.md)
- [vcpkg\_install\_qmake](vcpkg_install_qmake.md)
diff --git a/docs/maintainers/vcpkg_apply_patches.md b/docs/maintainers/vcpkg_apply_patches.md index d4d8dbfec..3524e5123 100644 --- a/docs/maintainers/vcpkg_apply_patches.md +++ b/docs/maintainers/vcpkg_apply_patches.md @@ -1,6 +1,6 @@ # vcpkg_apply_patches -Apply a set of patches to a source tree. +Apply a set of patches to a source tree. This function is deprecated in favor of the `PATCHES` argument to `vcpkg_from_github()` et al. ## Usage ```cmake @@ -27,9 +27,8 @@ This should only be used for edge cases, such as patches that are known to fail ## Examples -* [boost](https://github.com/Microsoft/vcpkg/blob/master/ports/boost/portfile.cmake) -* [freetype](https://github.com/Microsoft/vcpkg/blob/master/ports/freetype/portfile.cmake) -* [libpng](https://github.com/Microsoft/vcpkg/blob/master/ports/libpng/portfile.cmake) +* [libbson](https://github.com/Microsoft/vcpkg/blob/master/ports/libbson/portfile.cmake) +* [gdal](https://github.com/Microsoft/vcpkg/blob/master/ports/gdal/portfile.cmake) ## Source [scripts/cmake/vcpkg_apply_patches.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_apply_patches.cmake)
diff --git a/docs/maintainers/vcpkg_configure_cmake.md b/docs/maintainers/vcpkg_configure_cmake.md index ebbd92ed1..d020dbb69 100644 --- a/docs/maintainers/vcpkg_configure_cmake.md +++ b/docs/maintainers/vcpkg_configure_cmake.md @@ -38,7 +38,7 @@ This is needed for libraries that set their own source code's character set. Specifies the precise generator to use. This is useful if some project-specific buildsystem has been wrapped in a cmake script that won't perform an actual build. -If used for this purpose, it should be set to "NMake Makefiles". +If used for this purpose, it should be set to `"NMake Makefiles"`. ### OPTIONS Additional options passed to CMake during the configuration. diff --git a/docs/maintainers/vcpkg_configure_meson.md b/docs/maintainers/vcpkg_configure_meson.md new file mode 100644 index 000000000..c0bda8b63 --- /dev/null +++ b/docs/maintainers/vcpkg_configure_meson.md @@ -0,0 +1,38 @@ +# vcpkg_configure_meson + +Configure Meson for Debug and Release builds of a project. + +## Usage +```cmake +vcpkg_configure_meson( + SOURCE_PATH <${SOURCE_PATH}> + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the `meson.build`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### OPTIONS +Additional options passed to Meson during the configuration. + +### OPTIONS_RELEASE +Additional options passed to Meson during the Release configuration. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`. + +## Notes +This command supplies many common arguments to Meson. To see the full list, examine the source. + +## Examples + +* [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) +* [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) + +## Source +[scripts/cmake/vcpkg_configure_meson.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_meson.cmake)
diff --git a/docs/maintainers/vcpkg_fail_port_install.md b/docs/maintainers/vcpkg_fail_port_install.md index b3b48ad5e..462fed990 100644 --- a/docs/maintainers/vcpkg_fail_port_install.md +++ b/docs/maintainers/vcpkg_fail_port_install.md @@ -1,30 +1,37 @@ # vcpkg_fail_port_install -Fails the current portfile with a (default) error message +Checks common requirements and fails the current portfile with a (default) error message ## Usage ```cmake -vcpkg_fail_port_install([MESSAGE <message>] [ON_TARGET <target1> [<target2> ...]] +vcpkg_fail_port_install( + [ALWAYS] + [MESSAGE <"Reason for failure">] + [ON_TARGET <Windows> [<OSX> ...]] + [ON_ARCH <x64> [<arm> ...]] + [ON_CRT_LINKAGE <static> [<dynamic> ...]]) + [ON_LIBRARY_LINKAGE <static> [<dynamic> ...]] +) ``` ## Parameters ### MESSAGE -Additional failure message. If non is given a default message will be displayed depending on the failure condition +Additional failure message. If none is given, a default message will be displayed depending on the failure condition. ### ALWAYS -will always fail early +Will always fail early ### ON_TARGET -targets for which the build should fail early. Valid targets are <target> from VCPKG_IS_TARGET_<target> (see vcpkg_common_definitions.cmake) +Targets for which the build should fail early. Valid targets are `<target>` from `VCPKG_IS_TARGET_<target>` (see `vcpkg_common_definitions.cmake`). ### ON_ARCH -architecture for which the build should fail early. +Architecture for which the build should fail early. ### ON_CRT_LINKAGE CRT linkage for which the build should fail early. ### ON_LIBRARY_LINKAGE -library linkage for which the build should fail early. +Library linkage for which the build should fail early. ## Examples diff --git a/docs/maintainers/vcpkg_find_acquire_program.md b/docs/maintainers/vcpkg_find_acquire_program.md index 106bbe4b7..83e01ce00 100644 --- a/docs/maintainers/vcpkg_find_acquire_program.md +++ b/docs/maintainers/vcpkg_find_acquire_program.md @@ -14,20 +14,25 @@ This variable specifies both the program to be acquired as well as the out param The current list of programs includes: - 7Z +- ARIA2 (Downloader) - BISON +- DARK +- DOXYGEN - FLEX - GASPREPROCESSOR +- GPERF - PERL - PYTHON2 - PYTHON3 +- GIT - GO - JOM - MESON - NASM - NINJA - NUGET +- SCONS - YASM -- ARIA2 (Downloader) Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md). @@ -38,4 +43,4 @@ Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_ac * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) ## Source -[scripts/cmake/vcpkg_find_acquire_program.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_find_acquire_program.cmake)
+[scripts/cmake/vcpkg_find_acquire_program.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_find_acquire_program.cmake) diff --git a/docs/maintainers/vcpkg_fixup_cmake_targets.md b/docs/maintainers/vcpkg_fixup_cmake_targets.md index 5bad80656..5abd7c622 100644 --- a/docs/maintainers/vcpkg_fixup_cmake_targets.md +++ b/docs/maintainers/vcpkg_fixup_cmake_targets.md @@ -1,30 +1,42 @@ -# vcpkg_fixup_cmake_targets
-
-Transforms all `/debug/share/\<port\>/\*targets-debug.cmake` files and move them to `/share/\<port\>`.
-Removes all `/debug/share/\<port\>/\*targets.cmake and /debug/share/\<port\>/\*config.cmake`.
-
-Transforms all references matching `/bin/\*.exe tools/\<port\>/\*.exe` on Windows.
-Transforms all references matching `/bin/\* to /tools/\<port\>/\*` on other platforms.
-
-Fixups *${_IMPORT_PREFIX}* in auto generated targets to be one folder deeper.
-Replaces *${CURRENT_INSTALLED_DIR}* with *${_IMPORT_PREFIX}* in config files and targets.
-
-
-## Usage
-```cmake
-vcpkg_fixup_cmake_targets(CONFIG_PATH <config_path>)
-```
-
-## Parameters:
-### CONFIG_PATH
-*.cmake files subdirectory (e.g. "lib/cmake/${PORT}" or "cmake/${PORT}).
-### TARGET_PATH
-Optional location to place fixup'd files. Unecessary if target is "share/${PORT}".
-
-## Examples:
- - [Azure-uamqp-c](https://github.com/microsoft/vcpkg/blob/master/ports/azure-uamqp-c/portfile.cmake)
- - [Brigand](https://github.com/microsoft/vcpkg/blob/master/ports/brigand/portfile.cmake)
- - [cctz](https://github.com/microsoft/vcpkg/blob/master/ports/cctz/portfile.cmake)
-
-## Source
-[scripts/cmake/vcpkg_fixup_cmake_targets.cmake](https://github.com/microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_cmake_targets.cmake)
+# vcpkg_fixup_cmake_targets + +Merge release and debug CMake targets and configs to support multiconfig generators. + +Additionally corrects common issues with targets, such as absolute paths and incorrectly placed binaries. + +## Usage +```cmake +vcpkg_fixup_cmake_targets([CONFIG_PATH <share/${PORT}>] [TARGET_PATH <share/${PORT}>]) +``` + +## Parameters + +### CONFIG_PATH +Subpath currently containing `*.cmake` files subdirectory (like `lib/cmake/${PORT}`). Should be relative to `${CURRENT_PACKAGES_DIR}`. + +Defaults to `share/${PORT}`. + +### TARGET_PATH +Subpath to which the above `*.cmake` files should be moved. Should be relative to `${CURRENT_PACKAGES_DIR}`. +This needs to be specified if the port name differs from the `find_package()` name. + +Defaults to `share/${PORT}`. + +## Notes +Transform all `/debug/<CONFIG_PATH>/*targets-debug.cmake` files and move them to `/<TARGET_PATH>`. +Removes all `/debug/<CONFIG_PATH>/*targets.cmake` and `/debug/<CONFIG_PATH>/*config.cmake`. + +Transform all references matching `/bin/*.exe` to `/tools/<port>/*.exe` on Windows. +Transform all references matching `/bin/*` to `/tools/<port>/*` on other platforms. + +Fix `${_IMPORT_PREFIX}` in auto generated targets to be one folder deeper. +Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. + +## Examples + +* [concurrentqueue](https://github.com/Microsoft/vcpkg/blob/master/ports/concurrentqueue/portfile.cmake) +* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake) +* [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) + +## Source +[scripts/cmake/vcpkg_fixup_cmake_targets.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_cmake_targets.cmake)
diff --git a/docs/maintainers/vcpkg_install_meson.md b/docs/maintainers/vcpkg_install_meson.md new file mode 100644 index 000000000..5d1ffb398 --- /dev/null +++ b/docs/maintainers/vcpkg_install_meson.md @@ -0,0 +1,16 @@ +# vcpkg_install_meson + +Builds a meson project previously configured with `vcpkg_configure_meson()`. + +## Usage +```cmake +vcpkg_install_meson() +``` + +## Examples + +* [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) +* [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) + +## Source +[scripts/cmake/vcpkg_install_meson.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_meson.cmake)
diff --git a/docs/maintainers/vcpkg_prettify_command.md b/docs/maintainers/vcpkg_prettify_command.md index 1856e06b4..d06ba21b6 100644 --- a/docs/maintainers/vcpkg_prettify_command.md +++ b/docs/maintainers/vcpkg_prettify_command.md @@ -4,7 +4,7 @@ Turns list of command arguments into a formatted string. ## Usage ```cmake -vcpkg_prettify_command() +vcpkg_prettify_command(<INPUT_VAR> <OUTPUT_VAR>) ``` ## Examples diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 01f27c758..2e4f9e522 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,8 +1,7 @@ Source: abseil
-Version: 2019-12-19
+Version: 2020-03-03
Homepage: https://github.com/abseil/abseil-cpp
Description: an open-source collection designed to augment the C++ standard library.
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
\ No newline at end of file + 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.
\ No newline at end of file diff --git a/ports/abseil/fix-lnk2019-error.patch b/ports/abseil/fix-lnk2019-error.patch index f16f1f68b..645d1e094 100644 --- a/ports/abseil/fix-lnk2019-error.patch +++ b/ports/abseil/fix-lnk2019-error.patch @@ -1,39 +1,40 @@ -diff --git a/absl/base/options.h b/absl/base/options.h
-index 3961e63..d4f21ec 100644
---- a/absl/base/options.h
-+++ b/absl/base/options.h
-@@ -94,7 +94,7 @@
- // User code should not inspect this macro. To check in the preprocessor if
- // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY.
-
--#define ABSL_OPTION_USE_STD_ANY 2
-+#define ABSL_OPTION_USE_STD_ANY 0
-
-
- // ABSL_OPTION_USE_STD_OPTIONAL
-@@ -129,7 +129,7 @@
- // absl::optional is a typedef of std::optional, use the feature macro
- // ABSL_USES_STD_OPTIONAL.
-
--#define ABSL_OPTION_USE_STD_OPTIONAL 2
-+#define ABSL_OPTION_USE_STD_OPTIONAL 0
-
-
- // ABSL_OPTION_USE_STD_STRING_VIEW
-@@ -156,7 +156,7 @@
- // absl::string_view is a typedef of std::string_view, use the feature macro
- // ABSL_USES_STD_STRING_VIEW.
-
--#define ABSL_OPTION_USE_STD_STRING_VIEW 2
-+#define ABSL_OPTION_USE_STD_STRING_VIEW 0
-
-
- // ABSL_OPTION_USE_STD_VARIANT
-@@ -183,6 +183,6 @@
- // absl::variant is a typedef of std::variant, use the feature macro
- // ABSL_USES_STD_VARIANT.
-
--#define ABSL_OPTION_USE_STD_VARIANT 2
-+#define ABSL_OPTION_USE_STD_VARIANT 0
-
- #endif // ABSL_BASE_OPTIONS_H_
+diff --git a/absl/base/options.h b/absl/base/options.h +index 234137c..1fb77e4 100644 +--- a/absl/base/options.h ++++ b/absl/base/options.h +@@ -100,7 +100,7 @@ + // User code should not inspect this macro. To check in the preprocessor if + // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. + +-#define ABSL_OPTION_USE_STD_ANY 2 ++#define ABSL_OPTION_USE_STD_ANY 0 + + + // ABSL_OPTION_USE_STD_OPTIONAL +@@ -127,7 +127,7 @@ + // absl::optional is a typedef of std::optional, use the feature macro + // ABSL_USES_STD_OPTIONAL. + +-#define ABSL_OPTION_USE_STD_OPTIONAL 2 ++#define ABSL_OPTION_USE_STD_OPTIONAL 0 + + + // ABSL_OPTION_USE_STD_STRING_VIEW +@@ -154,7 +154,7 @@ + // absl::string_view is a typedef of std::string_view, use the feature macro + // ABSL_USES_STD_STRING_VIEW. + +-#define ABSL_OPTION_USE_STD_STRING_VIEW 2 ++#define ABSL_OPTION_USE_STD_STRING_VIEW 0 + + // ABSL_OPTION_USE_STD_VARIANT + // +@@ -180,7 +180,7 @@ + // absl::variant is a typedef of std::variant, use the feature macro + // ABSL_USES_STD_VARIANT. + +-#define ABSL_OPTION_USE_STD_VARIANT 2 ++#define ABSL_OPTION_USE_STD_VARIANT 0 + + + // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/ports/abseil/fix-usage-lnk-error.patch b/ports/abseil/fix-usage-lnk-error.patch deleted file mode 100644 index 94c5d98d9..000000000 --- a/ports/abseil/fix-usage-lnk-error.patch +++ /dev/null @@ -1,231 +0,0 @@ -diff --git a/absl/strings/ascii.cc b/absl/strings/ascii.cc
-index abea3e4..16d0bcc 100644
---- a/absl/strings/ascii.cc
-+++ b/absl/strings/ascii.cc
-@@ -51,108 +51,6 @@ namespace ascii_internal {
- // elif i % 16 == 15:
- // print
-
--// clang-format off
--// Array of bitfields holding character information. Each bit value corresponds
--// to a particular character feature. For readability, and because the value
--// of these bits is tightly coupled to this implementation, the individual bits
--// are not named. Note that bitfields for all characters above ASCII 127 are
--// zero-initialized.
--const unsigned char kPropertyBits[256] = {
-- 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, // 0x00
-- 0x40, 0x68, 0x48, 0x48, 0x48, 0x48, 0x40, 0x40,
-- 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, // 0x10
-- 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-- 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, // 0x20
-- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-- 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, // 0x30
-- 0x84, 0x84, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-- 0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05, // 0x40
-- 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-- 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, // 0x50
-- 0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x10,
-- 0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05, // 0x60
-- 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-- 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, // 0x70
-- 0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x40,
--};
--
--// Array of characters for the ascii_tolower() function. For values 'A'
--// through 'Z', return the lower-case character; otherwise, return the
--// identity of the passed character.
--const char kToLower[256] = {
-- '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
-- '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-- '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
-- '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-- '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
-- '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
-- '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
-- '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
-- '\x40', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-- 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
-- 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
-- 'x', 'y', 'z', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
-- '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
-- '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
-- '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
-- '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
-- '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
-- '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
-- '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
-- '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
-- '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
-- '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
-- '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
-- '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
-- '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
-- '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
-- '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
-- '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
-- '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
-- '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
-- '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
-- '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
--};
--
--// Array of characters for the ascii_toupper() function. For values 'a'
--// through 'z', return the upper-case character; otherwise, return the
--// identity of the passed character.
--const char kToUpper[256] = {
-- '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
-- '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-- '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
-- '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-- '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
-- '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
-- '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
-- '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
-- '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
-- '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
-- '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
-- '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
-- '\x60', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
-- 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-- 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-- 'X', 'Y', 'Z', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
-- '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
-- '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
-- '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
-- '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
-- '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
-- '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
-- '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
-- '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
-- '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
-- '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
-- '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
-- '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
-- '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
-- '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
-- '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
-- '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
--};
--// clang-format on
--
- } // namespace ascii_internal
-
- void AsciiStrToLower(std::string* s) {
-diff --git a/absl/strings/ascii.h b/absl/strings/ascii.h
-index 792aabe..989e464 100644
---- a/absl/strings/ascii.h
-+++ b/absl/strings/ascii.h
-@@ -62,14 +62,105 @@ namespace absl {
- ABSL_NAMESPACE_BEGIN
- namespace ascii_internal {
-
--// Declaration for an array of bitfields holding character information.
--extern const unsigned char kPropertyBits[256];
--
--// Declaration for the array of characters to upper-case characters.
--extern const char kToUpper[256];
--
--// Declaration for the array of characters to lower-case characters.
--extern const char kToLower[256];
-+// Array of bitfields holding character information. Each bit value corresponds
-+// to a particular character feature. For readability, and because the value
-+// of these bits is tightly coupled to this implementation, the individual bits
-+// are not named. Note that bitfields for all characters above ASCII 127 are
-+// zero-initialized.
-+const unsigned char kPropertyBits[256] = {
-+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, // 0x00
-+ 0x40, 0x68, 0x48, 0x48, 0x48, 0x48, 0x40, 0x40,
-+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, // 0x10
-+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-+ 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, // 0x20
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-+ 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, // 0x30
-+ 0x84, 0x84, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-+ 0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05, // 0x40
-+ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-+ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, // 0x50
-+ 0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x10,
-+ 0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05, // 0x60
-+ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-+ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, // 0x70
-+ 0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x40,
-+};
-+
-+// Array of characters for the ascii_tolower() function. For values 'A'
-+// through 'Z', return the lower-case character; otherwise, return the
-+// identity of the passed character.
-+const char kToLower[256] = {
-+ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
-+ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-+ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
-+ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-+ '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
-+ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
-+ '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
-+ '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
-+ '\x40', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
-+ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
-+ 'x', 'y', 'z', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
-+ '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
-+ '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
-+ '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
-+ '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
-+ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
-+ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
-+ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
-+ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
-+ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
-+ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
-+ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
-+ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
-+ '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
-+ '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
-+ '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
-+ '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
-+ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
-+ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
-+ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
-+ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
-+};
-+
-+// Array of characters for the ascii_toupper() function. For values 'a'
-+// through 'z', return the upper-case character; otherwise, return the
-+// identity of the passed character.
-+const char kToUpper[256] = {
-+ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
-+ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-+ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
-+ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-+ '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
-+ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
-+ '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
-+ '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
-+ '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
-+ '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
-+ '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
-+ '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
-+ '\x60', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
-+ 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-+ 'X', 'Y', 'Z', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
-+ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
-+ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
-+ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
-+ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
-+ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
-+ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
-+ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
-+ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
-+ '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
-+ '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
-+ '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
-+ '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
-+ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
-+ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
-+ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
-+ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
-+};
-
- } // namespace ascii_internal
-
diff --git a/ports/abseil/fix-uwp-build.patch b/ports/abseil/fix-uwp-build.patch new file mode 100644 index 000000000..a9b4a0c07 --- /dev/null +++ b/ports/abseil/fix-uwp-build.patch @@ -0,0 +1,66 @@ +diff --git a/absl/base/internal/sysinfo.cc b/absl/base/internal/sysinfo.cc +index a0930e9..2ec5793 100644 +--- a/absl/base/internal/sysinfo.cc ++++ b/absl/base/internal/sysinfo.cc +@@ -72,6 +72,12 @@ static int GetNumCPUs() { + #if defined(_WIN32) + + static double GetNominalCPUFrequency() { ++// UWP apps don't have access to the registry and currently don't provide an ++// API informing about CPU nominal frequency. ++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ ++ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) ++ return 1.0; ++#else + #pragma comment(lib, "advapi32.lib") // For Reg* functions. + HKEY key; + // Use the Reg* functions rather than the SH functions because shlwapi.dll +@@ -91,6 +97,7 @@ static double GetNominalCPUFrequency() { + } + } + return 1.0; ++#endif // WINAPI_PARTITION_APP && !WINAPI_PARTITION_DESKTOP + } + + #elif defined(CTL_HW) && defined(HW_CPU_FREQ) +diff --git a/absl/debugging/symbolize_win32.inc b/absl/debugging/symbolize_win32.inc +index c3df46f..d324fc1 100644 +--- a/absl/debugging/symbolize_win32.inc ++++ b/absl/debugging/symbolize_win32.inc +@@ -36,6 +36,11 @@ ABSL_NAMESPACE_BEGIN + static HANDLE process = NULL; + + void InitializeSymbolizer(const char*) { ++// UWP doesn't support this function ++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ ++ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) ++ return; ++#else + if (process != nullptr) { + return; + } +@@ -52,9 +57,16 @@ void InitializeSymbolizer(const char*) { + const unsigned long long error{GetLastError()}; // NOLINT(runtime/int) + ABSL_RAW_LOG(FATAL, "SymInitialize() failed: %llu", error); + } ++#endif + } + + bool Symbolize(const void* pc, char* out, int out_size) { ++ ++// UWP doesn't support this function ++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ ++ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) ++ return false; ++#else + if (out_size <= 0) { + return false; + } +@@ -75,6 +87,7 @@ bool Symbolize(const void* pc, char* out, int out_size) { + out[out_size - 1] = '\0'; + } + return true; ++#endif + } + + ABSL_NAMESPACE_END diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 6acc0ea39..4bc6e76dd 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -1,16 +1,14 @@ -vcpkg_fail_port_install(ON_TARGET "UWP")
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
- REF 29235139149790f5afc430c11cec8f1eb1677607 #commit 2019-12-19 - SHA512 be34c782eb6cdb3355ab56f1592e692435a63bf19a0364980d498c75db267e986e60a3e425bd3b9c57b7f8afdb7c642eb68386165ec147a6d5b448570bbe756a
+ REF 06f0e767d13d4d68071c4fc51e25724e0fc8bc74 #commit 2020-03-03 + SHA512 f6e2302676ddae39d84d8ec92dbd13520ae214013b43455f14ced3ae6938b94cedb06cfc40eb1781dac48f02cd35ed80673ed2d871541ef4438c282a9a4133b9
HEAD_REF master
PATCHES
- fix-usage-lnk-error.patch
fix-lnk2019-error.patch
+ fix-uwp-build.patch
)
vcpkg_configure_cmake(
@@ -22,10 +20,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/absl TARGET_PATH share/absl)
vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/include/absl/copts
${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata
- ${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata)
\ No newline at end of file + ${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 4cf1db8bc..7bbba7358 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,5 +1,5 @@ Source: ace -Version: 6.5.7-1 +Version: 6.5.8 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment Supports: !uwp diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 60f376b92..ee0a0e082 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,19 +1,21 @@ +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") + # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. if(VCPKG_TARGET_IS_WINDOWS) # Don't change to vcpkg_from_github! This points to a release and not an archive vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE-src-6.5.7.zip" - FILENAME ACE-src-6.5.7.zip - SHA512 6ce6954941521b34ae8913dfe053d0f066632c55adf4091dae6bc180c79963d6f4ddfec7796cd6d9fc8ff59037ee162d20b017c4c296828913498bdbac2fc8a7 + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-src-6.5.8.zip" + FILENAME ACE-src-6.5.8.zip + SHA512 e0fd30de81f0d6e629394fc9cb814ecb786c67fccd7e975a3d64cf0859d5a03ba5a5ae4bb0a6ce5e6d16395a48ffa28f5a1a92758e08a3fd7d55582680f94d82 ) else(VCPKG_TARGET_IS_WINDOWS) # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE-src-6.5.7.tar.gz" - FILENAME ACE-src-6.5.7.tar.gz - SHA512 0116e269e2d49ba8afccc7abfc7492e5a6a286dcbdcfe850a21f86b4facb5fef2848985d803233f4b1fbb03457e592375ab24c62e7bbaab5c28cc240ccedbacb + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-src-6.5.8.tar.gz" + FILENAME ACE-src-6.5.8.tar.gz + SHA512 45ee6cf4302892ac9de305f8454109fa17a8b703187cc76555ce3641b621909e0cfedf3cc4a7fe1a8f01454637279cc9c4afe9d67466d5253e0ba1f34431d97f ) endif() @@ -26,10 +28,6 @@ set(ACE_ROOT ${SOURCE_PATH}) set(ENV{ACE_ROOT} ${ACE_ROOT}) set(ACE_SOURCE_PATH ${ACE_ROOT}/ace) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - if("wchar" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "uses_wchar=1") endif() @@ -53,13 +51,12 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(MPC_STATIC_FLAG -static) endif() +# Acquire Perl and add it to PATH (for execution of MPC) vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path(${PERL_PATH}) -if (TRIPLET_SYSTEM_ARCH MATCHES "arm") - message(FATAL_ERROR "ARM is currently not supported.") -elseif (TRIPLET_SYSTEM_ARCH MATCHES "x86") +if (TRIPLET_SYSTEM_ARCH MATCHES "x86") set(MSBUILD_PLATFORM "Win32") else () set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) @@ -176,7 +173,7 @@ if(VCPKG_TARGET_IS_WINDOWS) # Handle copyright file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright) + file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) else(VCPKG_TARGET_IS_WINDOWS) # VCPKG_TARGTE_IS_LINUX FIND_PROGRAM(MAKE make) @@ -243,5 +240,5 @@ else(VCPKG_TARGET_IS_WINDOWS) set($ENV{PWD} _prev_env) # Handle copyright - file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright) -endif()
\ No newline at end of file + file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +endif() diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index 26122342a..463195880 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -1,5 +1,5 @@ Source: angle -Version: 2019-12-31 +Version: 2019-12-31-1 Homepage: https://github.com/google/angle Description: A conformant OpenGL ES implementation for Windows, Mac and Linux. The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support. diff --git a/ports/azmq/CONTROL b/ports/azmq/CONTROL index 350bee266..8d29c6d03 100644 --- a/ports/azmq/CONTROL +++ b/ports/azmq/CONTROL @@ -1,6 +1,7 @@ Source: azmq -Version: 1.0.2 +Version: 2020-03-03 Build-Depends: boost-asio, boost-assert, boost-config, boost-container, boost-format, boost-intrusive, boost-iterator, boost-lexical-cast, boost-logic, boost-optional, boost-random, boost-range, boost-regex, boost-system, boost-thread, boost-utility, zeromq +Homepage: https://github.com/zeromq/azmq Description: Boost Asio style bindings for ZeroMQ This library is built on top of ZeroMQ's standard C interface and is intended to work well with C++ applications which use the Boost libraries in general, and Asio in particular. The main abstraction exposed by the library is azmq::socket which provides an Asio style socket interface to the underlying zeromq socket and interfaces with Asio's io_service(). The socket implementation participates in the io_service's reactor for asynchronous IO and may be freely mixed with other Asio socket types (raw TCP/UDP/Serial/etc.). diff --git a/ports/azmq/portfile.cmake b/ports/azmq/portfile.cmake index 867b688ee..c2d333f60 100644 --- a/ports/azmq/portfile.cmake +++ b/ports/azmq/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/azmq - REF v1.0.2 - SHA512 6e60a670d070ddf84dbd406e88225ff12f84ce39e0e64e9aff4314e174506c286d72cfebb5e2e51eab221f6e163a17cce539d052cea3c18954ec495b096f087b + REF 6bb101eecb357ad9735ebc36e276b7526652d42d # commit on 2019-05-01 + SHA512 18812fd73c3c57aca8b17c2df0af01afb7864253d6ac6ce042e01ef04e81dd454438c9d01f5bb0fd7a4a445082a2eb3dd334ca1e05dafbe4ba602cad95ce7134 HEAD_REF master ) @@ -12,4 +10,4 @@ file(COPY ${SOURCE_PATH}/azmq DESTINATION ${CURRENT_PACKAGES_DIR}/include/) file(INSTALL ${SOURCE_PATH}/LICENSE-BOOST_1_0 - DESTINATION ${CURRENT_PACKAGES_DIR}/share/azmq RENAME copyright) + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL index 66a402f8f..656d9d9bc 100644 --- a/ports/azure-storage-cpp/CONTROL +++ b/ports/azure-storage-cpp/CONTROL @@ -1,5 +1,5 @@ Source: azure-storage-cpp -Version: 7.1.0-1 +Version: 7.2.0 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. diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index 442afec74..2a886fe69 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-storage-cpp - REF v7.1.0 - SHA512 19ed12ee397141f2b5374857ff56514228cd6541307f754b2595507f8a81821fe49d3c8c4312c484678739432ad1a7d5202f1b2d48aa348e4601053dbb430ed9 + REF v7.2.0 + SHA512 fb94a3311c1b02e8ef1776569329edfb58021606d2a8ad1d9c14627c01bd4696233451ad5a94cbccae12468cfe5989f90429bc25a02792c5b8889129b0b912b3 HEAD_REF master ) diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL index 43a218bd4..d9198b970 100644 --- a/ports/blaze/CONTROL +++ b/ports/blaze/CONTROL @@ -1,5 +1,5 @@ Source: blaze -Version: 3.6-1 +Version: 3.7 Build-Depends: clapack (!osx), boost-exception Homepage: https://bitbucket.org/blaze-lib/blaze Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic. diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake index 0da26acd0..96d1d165e 100644 --- a/ports/blaze/portfile.cmake +++ b/ports/blaze/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions) - vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO blaze-lib/blaze - REF 51fff70fcc70c8bcb167b5daa497babf51b7603e - SHA512 7048720d1842a0a8e621f6878c43942664523f889f2659f4334c7428d1177a5a226c95bcb5f84b93cae87c61e188bf91dc2429b1ddfc7b6a7b8eb74ab8c0a1ec + REF e9724478a5fd29b9c2f8c45f0be95ad774ab4d4f + SHA512 d1699fffe3013d571e34cf5444714647428be257cad90c4bc6cca8051702ff6d086eb731dca408faaf83b9311df4138f55187673235128fcd3c03029af337a75 HEAD_REF master ) @@ -12,7 +10,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBLAZE_SMP_THREADS=C++11 + -DBLAZE_SMP_THREADS=OpenMP ) vcpkg_install_cmake() @@ -22,5 +20,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/blaze/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/blaze) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/blaze/LICENSE ${CURRENT_PACKAGES_DIR}/share/blaze/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index cd5f46115..8c91184a4 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -36,10 +36,18 @@ endif() if(APPLE)
list(APPEND B2_OPTIONS target-os=darwin toolset=clang)
+elseif(WIN32)
+ list(APPEND B2_OPTIONS target-os=windows toolset=gcc)
else()
list(APPEND B2_OPTIONS target-os=linux toolset=gcc)
endif()
+if(WIN32)
+ list(APPEND B2_OPTIONS threadapi=win32)
+else()
+ list(APPEND B2_OPTIONS threadapi=pthread)
+endif()
+
# Properly handle compiler and linker flags passed by VCPKG
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -114,17 +122,8 @@ endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam ${CMAKE_CURRENT_BINARY_DIR}/user-config.jam @ONLY)
-set(NUMBER_OF_PROCESSORS 1)
-if(DEFINED ENV{NUMBER_OF_PROCESSORS})
- set(NUMBER_OF_PROCESSORS $ENV{NUMBER_OF_PROCESSORS})
-elseif(CMAKE_HOST_LINUX)
- execute_process(
- COMMAND nproc
- OUTPUT_VARIABLE NUMBER_OF_PROCESSORS
- )
- string(REPLACE "\n" "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
- string(REPLACE " " "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
-endif()
+include(ProcessorCount)
+ProcessorCount(NUMBER_OF_PROCESSORS)
if(NOT NUMBER_OF_PROCESSORS)
set(NUMBER_OF_PROCESSORS 1)
endif()
@@ -156,7 +155,6 @@ add_custom_target(boost ALL architecture=x86
threading=multi
- threadapi=pthread
debug-symbols=on
stage
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index d5529c127..f254cb5a3 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -75,17 +75,35 @@ function(boost_modular_build) # endif()
if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set(configure_option)
if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)
- set(fragment_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")
+ list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")
+ endif()
+ if(DEFINED VCPKG_PYTHON_EXECUTABLE)
+ list(APPEND configure_option "-DVCPKG_PYTHON_EXECUTABLE=${VCPKG_PYTHON_EXECUTABLE}")
+ endif()
+ if(DEFINED VCPKG_PYTHON_INCLUDE)
+ list(APPEND configure_option "-DVCPKG_PYTHON_INCLUDE=${VCPKG_PYTHON_INCLUDE}")
+ endif()
+ if(DEFINED VCPKG_PYTHON_LIBS_RELEASE)
+ list(APPEND configure_option "-DVCPKG_PYTHON_LIBS_RELEASE=${VCPKG_PYTHON_LIBS_RELEASE}")
+ endif()
+ if(DEFINED VCPKG_PYTHON_LIBS_DEBUG)
+ list(APPEND configure_option "-DVCPKG_PYTHON_LIBS_DEBUG=${VCPKG_PYTHON_LIBS_DEBUG}")
+ endif()
+ if(DEFINED VCPKG_PYTHON_VERSION)
+ list(APPEND configure_option "-DVCPKG_PYTHON_VERSION=${VCPKG_PYTHON_VERSION}")
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${CURRENT_INSTALLED_DIR}/share/boost-build
PREFER_NINJA
OPTIONS
+ "-DPORT=${PORT}"
+ "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}"
"-DB2_EXE=${B2_EXE}"
"-DSOURCE_PATH=${_bm_SOURCE_PATH}"
"-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}"
- ${fragment_option}
+ ${configure_option}
)
vcpkg_install_cmake()
@@ -126,15 +144,10 @@ function(boost_modular_build) ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
)
- if(DEFINED ENV{NUMBER_OF_PROCESSORS})
- set(NUMBER_OF_PROCESSORS $ENV{NUMBER_OF_PROCESSORS})
- else()
- execute_process(
- COMMAND nproc
- OUTPUT_VARIABLE NUMBER_OF_PROCESSORS
- )
- string(REPLACE "\n" "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
- string(REPLACE " " "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
+ include(ProcessorCount)
+ ProcessorCount(NUMBER_OF_PROCESSORS)
+ if(NOT NUMBER_OF_PROCESSORS)
+ set(NUMBER_OF_PROCESSORS 1)
endif()
######################
@@ -195,7 +208,6 @@ function(boost_modular_build) list(APPEND _bm_OPTIONS_DBG "cxxflags=${VCPKG_CXX_FLAGS_DEBUG}")
endif()
-
if(VCPKG_C_FLAGS)
list(APPEND _bm_OPTIONS "cflags=${VCPKG_C_FLAGS}")
endif()
@@ -208,7 +220,6 @@ function(boost_modular_build) list(APPEND _bm_OPTIONS_DBG "cflags=${VCPKG_C_FLAGS_DEBUG}")
endif()
-
if(VCPKG_LINKER_FLAGS)
list(APPEND _bm_OPTIONS "linkflags=${VCPKG_LINKER_FLAGS}")
endif()
@@ -221,7 +232,6 @@ function(boost_modular_build) list(APPEND _bm_OPTIONS_DBG "linkflags=${VCPKG_LINKER_FLAGS_DEBUG}")
endif()
-
# Add build type specific options
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
list(APPEND _bm_OPTIONS runtime-link=shared)
@@ -246,7 +256,7 @@ function(boost_modular_build) endif()
file(TO_CMAKE_PATH "${_bm_DIR}/nothing.bat" NOTHING_BAT)
- set(TOOLSET_OPTIONS " <cxxflags>/EHsc <compileflags>-Zm800 <compileflags>-nologo")
+ set(TOOLSET_OPTIONS "<cxxflags>/EHsc <compileflags>-Zm800 <compileflags>-nologo")
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(NOT VCPKG_PLATFORM_TOOLSET MATCHES "v140")
find_path(PATH_TO_CL cl.exe)
diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index 78677c0ab..9f485fee2 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -2,10 +2,11 @@ import toolset ; if "@VCPKG_PLATFORM_TOOLSET@" != "external"
{
- using msvc : : cl.exe :
- <setup>"@NOTHING_BAT@"
- @TOOLSET_OPTIONS@
- ;
+ using msvc : : cl.exe
+ :
+ <setup>"@NOTHING_BAT@"
+ @TOOLSET_OPTIONS@
+ ;
}
else
{
@@ -23,8 +24,8 @@ else if "@PORT@" = "boost-python"
{
- using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_RELEASE@" ;
- using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_DEBUG@" : <python-debugging>on ;
+ using python : @VCPKG_PYTHON_VERSION@ : "@VCPKG_PYTHON_EXECUTABLE@" : "@VCPKG_PYTHON_INCLUDE@" : "@VCPKG_PYTHON_LIBS_RELEASE@" ;
+ using python : @VCPKG_PYTHON_VERSION@ : "@VCPKG_PYTHON_EXECUTABLE@" : "@VCPKG_PYTHON_INCLUDE@" : "@VCPKG_PYTHON_LIBS_DEBUG@" : <python-debugging>on ;
}
if "@PORT@" = "boost-mpi"
@@ -37,16 +38,30 @@ if "@PORT@" = "boost-mpi" project user-config : ;
-lib advapi32 ;
+if "@VCPKG_PLATFORM_TOOLSET@" != "external"
+{
+ lib advapi32 ;
+
+ lib icuuc : : <file>"@CURRENT_INSTALLED_DIR@/lib/icuuc.lib" <variant>release : : <library>advapi32 ;
+ lib icuuc : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib" <variant>debug : : <library>advapi32 ;
-lib icuuc : : <file>"@CURRENT_INSTALLED_DIR@/lib/icuuc.lib" <variant>release : : <library>advapi32 ;
-lib icuuc : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib" <variant>debug : : <library>advapi32 ;
+ lib icuin : : <file>"@CURRENT_INSTALLED_DIR@/lib/icuin.lib" <variant>release : : ;
+ lib icuin : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" <variant>debug : : ;
-lib icuin : : <file>"@CURRENT_INSTALLED_DIR@/lib/icuin.lib" <variant>release : : ;
-lib icuin : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" <variant>debug : : ;
+ lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/lib/icudt.lib" <variant>release : : ;
+ lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" <variant>debug : : ;
+}
+else
+{
+ lib icuuc : : <file>"@CURRENT_INSTALLED_DIR@/lib/libicuuc.a" <variant>release : : ;
+ lib icuuc : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/libicuuc.a" <variant>debug : : ;
-lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/lib/icudt.lib" <variant>release : : ;
-lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" <variant>debug : : ;
+ lib icuin : : <file>"@CURRENT_INSTALLED_DIR@/lib/libicui18n.a" <variant>release : : ;
+ lib icuin : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/libicui18n.a" <variant>debug : : ;
+
+ lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/lib/libicudata.a" <variant>release : : ;
+ lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/libicudata.a" <variant>debug : : ;
+}
lib iconv : : <file>"@LIBICONV_LIBRARY@" <link>shared <runtime-link>shared <variant>release : : ;
lib iconv : : <file>"@LIBICONV_LIBRARY@" <link>shared <runtime-link>shared <variant>debug : : ;
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 84e4434a2..b1e0cba23 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-python
-Version: 1.72.0
-Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 (!osx&!linux)
+Version: 1.72.0-1
+Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3
Homepage: https://github.com/boostorg/python
Description: Boost python module
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index ec1f706a0..d81d6889c 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -10,11 +10,14 @@ vcpkg_from_github( HEAD_REF master
)
-# Find Python. Can't use find_package here, but we already know where everything is
-file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python3.*")
-set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
-set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
-string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION "${PYTHON_INCLUDE_PATH}")
+# Find Python3 executable
+vcpkg_find_acquire_program(PYTHON3)
+set(VCPKG_PYTHON_EXECUTABLE "${PYTHON3}")
+# Find Python3 libraries. Can't use find_package here, but we already know where everything is
+file(GLOB VCPKG_PYTHON_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*")
+set(VCPKG_PYTHON_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+set(VCPKG_PYTHON_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
+string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON_VERSION "${VCPKG_PYTHON_INCLUDE}")
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL index aef306101..ff152f83b 100644 --- a/ports/brotli/CONTROL +++ b/ports/brotli/CONTROL @@ -1,4 +1,4 @@ Source: brotli
-Version: 1.0.7
+Version: 1.0.7-1
Homepage: https://github.com/google/brotli
Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
diff --git a/ports/brotli/fix-arm-uwp.patch b/ports/brotli/fix-arm-uwp.patch new file mode 100644 index 000000000..7ed3fcd3d --- /dev/null +++ b/ports/brotli/fix-arm-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6c6054..2c4b757 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,6 +124,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + add_definitions(-DOS_FREEBSD) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + add_definitions(-DOS_MACOSX) ++elseif(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS) + endif() + + function(transform_sources_list INPUT_FILE OUTPUT_FILE) diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake index fa0413711..6fa75937c 100644 --- a/ports/brotli/portfile.cmake +++ b/ports/brotli/portfile.cmake @@ -1,12 +1,12 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/brotli REF v1.0.7 SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a HEAD_REF master - PATCHES install.patch + PATCHES + install.patch + fix-arm-uwp.patch ) vcpkg_configure_cmake( @@ -17,10 +17,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_copy_pdbs() + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli) vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/brotli RENAME copyright) - -vcpkg_copy_pdbs() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/bullet3/CONTROL b/ports/bullet3/CONTROL index be9bf2ef3..4c91594cd 100644 --- a/ports/bullet3/CONTROL +++ b/ports/bullet3/CONTROL @@ -1,5 +1,5 @@ Source: bullet3
-Version: 2.89
+Version: 2.89-1
Homepage: https://github.com/bulletphysics/bullet3
Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index cfad9f391..82bb8c793 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -11,10 +11,9 @@ vcpkg_from_github( PATCHES cmake-fix.patch ) -set(BULLET_MULTITHREADING OFF) -if ("multithreading" IN_LIST FEATURES) - set(BULLET_MULTITHREADING ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + multithreading BULLET2_MULTITHREADING +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -28,7 +27,7 @@ vcpkg_configure_cmake( -DBUILD_EXTRAS=OFF -DBUILD_UNIT_TESTS=OFF -DINSTALL_LIBS=ON - -DBULLET2_MULTITHREADING=${BULLET_MULTITHREADING} + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() @@ -42,5 +41,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics vcpkg_copy_pdbs() -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3 RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/bullet3/usage b/ports/bullet3/usage new file mode 100644 index 000000000..43b6d667a --- /dev/null +++ b/ports/bullet3/usage @@ -0,0 +1,4 @@ +The package bullet3 provides CMake targets:
+
+find_package(Bullet CONFIG REQUIRED)
+target_link_libraries(main PRIVATE LinearMath Bullet3Common BulletDynamics BulletSoftBody)
diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL index 5f52faad4..695925c07 100644 --- a/ports/bzip2/CONTROL +++ b/ports/bzip2/CONTROL @@ -1,4 +1,4 @@ Source: bzip2
-Version: 1.0.6-4
+Version: 1.0.6-5
Homepage: http://www.bzip.org/
Description: High-quality data compressor.
diff --git a/ports/bzip2/fix-windows-include.patch b/ports/bzip2/fix-windows-include.patch new file mode 100644 index 000000000..11797ad2f --- /dev/null +++ b/ports/bzip2/fix-windows-include.patch @@ -0,0 +1,12 @@ +diff -urN bzip2-1.0.6-orig/bzip2.c bzip2-1.0.6/bzip2.c +--- bzip2-1.0.6-orig/bzip2.c 2010-09-11 02:04:53.000000000 +0300 ++++ bzip2-1.0.6/bzip2.c 2019-11-04 11:40:52.230652175 +0200 +@@ -128,7 +128,7 @@ + #if BZ_LCCWIN32 + # include <io.h> + # include <fcntl.h> +-# include <sys\stat.h> ++# include <sys/stat.h> + + # define NORETURN /**/ + # define PATH_SEP '\\' diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 25e3df10f..0462d53eb 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive_ex( REF ${BZIP2_VERSION}
PATCHES
fix-import-export-macros.patch
+ fix-windows-include.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index 09268815c..8da4c6611 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,4 +1,4 @@ Source: celero -Version: 2.6.0 +Version: 2.6.0-1 Homepage: https://github.com/DigitalInBlue/Celero Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++. diff --git a/ports/celero/fix-win32-define.patch b/ports/celero/fix-win32-define.patch new file mode 100644 index 000000000..0a90dbed9 --- /dev/null +++ b/ports/celero/fix-win32-define.patch @@ -0,0 +1,490 @@ +diff --git a/README.md b/README.md +index 5b83f2d..151f5d1 100644 +--- a/README.md ++++ b/README.md +@@ -166,7 +166,7 @@ Here is an example of a simple Celero Benchmark. (Note: This is a complete, runn + + #include <random> + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <cmath> + #include <cstdlib> + #endif +diff --git a/experiments/DemoSimple/DemoSimple.cpp b/experiments/DemoSimple/DemoSimple.cpp +index 2a0a0c3..f0c300f 100644 +--- a/experiments/DemoSimple/DemoSimple.cpp ++++ b/experiments/DemoSimple/DemoSimple.cpp +@@ -2,7 +2,7 @@ + + #include <random> + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <cmath> + #include <cstdlib> + #endif +diff --git a/experiments/DemoSimpleJUnit/DemoSimpleJUnit.cpp b/experiments/DemoSimpleJUnit/DemoSimpleJUnit.cpp +index 86c47c1..0be4ac2 100644 +--- a/experiments/DemoSimpleJUnit/DemoSimpleJUnit.cpp ++++ b/experiments/DemoSimpleJUnit/DemoSimpleJUnit.cpp +@@ -1,6 +1,6 @@ + #include <celero/Celero.h> + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <cmath> + #include <cstdlib> + #endif +diff --git a/experiments/DemoTransform/DemoTransform.cpp b/experiments/DemoTransform/DemoTransform.cpp +index 25b37a2..55e7e60 100644 +--- a/experiments/DemoTransform/DemoTransform.cpp ++++ b/experiments/DemoTransform/DemoTransform.cpp +@@ -4,7 +4,7 @@ + #include <algorithm> + #include <functional> + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <cmath> + #include <cstdlib> + #endif +diff --git a/experiments/ExperimentSortingRandomInts/ExperimentSortingRandomInts.cpp b/experiments/ExperimentSortingRandomInts/ExperimentSortingRandomInts.cpp +index 0f3b8ed..e8f85c5 100644 +--- a/experiments/ExperimentSortingRandomInts/ExperimentSortingRandomInts.cpp ++++ b/experiments/ExperimentSortingRandomInts/ExperimentSortingRandomInts.cpp +@@ -1,7 +1,7 @@ + #include <celero/Celero.h> + #include <algorithm> + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <cmath> + #include <cstdlib> + #endif +diff --git a/experiments/ExperimentSortingRandomIntsUDM/ExperimentSortingRandomIntsUDM.cpp b/experiments/ExperimentSortingRandomIntsUDM/ExperimentSortingRandomIntsUDM.cpp +index e724fa2..8df7296 100644 +--- a/experiments/ExperimentSortingRandomIntsUDM/ExperimentSortingRandomIntsUDM.cpp ++++ b/experiments/ExperimentSortingRandomIntsUDM/ExperimentSortingRandomIntsUDM.cpp +@@ -3,7 +3,7 @@ + #include <iostream> + #include <string> + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <cmath> + #include <cstdlib> + #endif +diff --git a/include/celero/Celero.h b/include/celero/Celero.h +index aaf38ef..a7c91d4 100644 +--- a/include/celero/Celero.h ++++ b/include/celero/Celero.h +@@ -31,7 +31,7 @@ + /// It is highly encouraged to only run this code compiled in a "Release" mode to use all available optimizations. + /// + +-#ifdef WIN32 ++#ifdef _WIN32 + #include <process.h> + #endif + +diff --git a/include/celero/CommandLine.h b/include/celero/CommandLine.h +index 230417a..82204f9 100644 +--- a/include/celero/CommandLine.h ++++ b/include/celero/CommandLine.h +@@ -38,7 +38,7 @@ + #include <typeinfo> + #include <vector> + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <cxxabi.h> + #endif + +@@ -115,7 +115,7 @@ namespace cmdline + return lexical_cast_t<Target, Source, detail::is_same<Target, Source>::value>::cast(arg); + } + +-#ifdef WIN32 ++#ifdef _WIN32 + static inline std::string demangle(const std::string &) + { + return std::string(); +diff --git a/include/celero/Export.h b/include/celero/Export.h +index b672b15..a074e37 100644 +--- a/include/celero/Export.h ++++ b/include/celero/Export.h +@@ -23,7 +23,7 @@ + #define CELERO_EXPORT + #define CELERO_EXPORT_C + #else +-#ifdef WIN32 ++#ifdef _WIN32 + #if defined CELERO_EXPORTS + #define CELERO_EXPORT _declspec(dllexport) + #define CELERO_EXPORT_C extern "C" _declspec(dllexport) +diff --git a/include/celero/Utilities.h b/include/celero/Utilities.h +index 4f409e5..93e3c53 100644 +--- a/include/celero/Utilities.h ++++ b/include/celero/Utilities.h +@@ -19,7 +19,7 @@ + /// limitations under the License. + /// + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <unistd.h> + #endif + +diff --git a/src/Console.cpp b/src/Console.cpp +index 91e2059..b4c62ec 100644 +--- a/src/Console.cpp ++++ b/src/Console.cpp +@@ -20,14 +20,14 @@ + + using namespace celero; + +-#ifdef WIN32 ++#ifdef _WIN32 + #include <Windows.h> + #include <stdio.h> + #else + #include <iostream> + #endif + +-#ifdef WIN32 ++#ifdef _WIN32 + auto WinColor() -> decltype(GetStdHandle(STD_OUTPUT_HANDLE)) + { + auto h = GetStdHandle(STD_OUTPUT_HANDLE); +@@ -39,7 +39,7 @@ auto WinColor() -> decltype(GetStdHandle(STD_OUTPUT_HANDLE)) + + void Red() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_RED); + #else +@@ -49,7 +49,7 @@ void Red() + + void RedBold() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_RED | FOREGROUND_INTENSITY); + #else +@@ -59,7 +59,7 @@ void RedBold() + + void Green() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_GREEN); + #else +@@ -69,7 +69,7 @@ void Green() + + void GreenBold() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_GREEN | FOREGROUND_INTENSITY); + #else +@@ -79,7 +79,7 @@ void GreenBold() + + void Blue() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_BLUE); + #else +@@ -89,7 +89,7 @@ void Blue() + + void BlueBold() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_BLUE | FOREGROUND_INTENSITY); + #else +@@ -99,7 +99,7 @@ void BlueBold() + + void Cyan() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_BLUE | FOREGROUND_GREEN); + #else +@@ -109,7 +109,7 @@ void Cyan() + + void CyanBold() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY); + #else +@@ -119,7 +119,7 @@ void CyanBold() + + void Yellow() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_RED | FOREGROUND_GREEN); + #else +@@ -129,7 +129,7 @@ void Yellow() + + void YellowBold() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY); + #else +@@ -139,7 +139,7 @@ void YellowBold() + + void White() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE); + #else +@@ -149,7 +149,7 @@ void White() + + void WhiteBold() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY); + #else +@@ -159,7 +159,7 @@ void WhiteBold() + + void WhiteOnRed() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, BACKGROUND_RED | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE); + #else +@@ -169,7 +169,7 @@ void WhiteOnRed() + + void WhiteOnRedBold() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, BACKGROUND_RED | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY); + #else +@@ -179,7 +179,7 @@ void WhiteOnRedBold() + + void PurpleBold() + { +-#ifdef WIN32 ++#ifdef _WIN32 + auto h = WinColor(); + SetConsoleTextAttribute(h, FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY); + #else +@@ -189,7 +189,7 @@ void PurpleBold() + + void Default() + { +-#ifdef WIN32 ++#ifdef _WIN32 + White(); + #else + std::cout << "\033[0m"; +diff --git a/src/Exceptions.cpp b/src/Exceptions.cpp +index 9cb1918..7780774 100644 +--- a/src/Exceptions.cpp ++++ b/src/Exceptions.cpp +@@ -21,7 +21,7 @@ + #include <celero/Console.h> + #include <celero/TestFixture.h> + +-#ifdef WIN32 ++#ifdef _WIN32 + #include <Windows.h> + #endif // WIN32 + +diff --git a/src/Memory.cpp b/src/Memory.cpp +index f1662d4..fde7f19 100644 +--- a/src/Memory.cpp ++++ b/src/Memory.cpp +@@ -19,7 +19,7 @@ + #include <celero/Memory.h> + #include <sstream> + +-#ifdef WIN32 ++#ifdef _WIN32 + #include <Windows.h> + + #include <Psapi.h> +@@ -53,7 +53,7 @@ + + using namespace celero; + +-#ifdef WIN32 ++#ifdef _WIN32 + #else + constexpr int64_t Kilobytes2Bytes{1024}; + +@@ -120,7 +120,7 @@ celero::RAMReport celero::RAMReport::operator-(const RAMReport& x) + + int64_t celero::GetRAMSystemTotal() + { +-#ifdef WIN32 ++#ifdef _WIN32 + MEMORYSTATUSEX memInfo; + memInfo.dwLength = sizeof(MEMORYSTATUSEX); + GlobalMemoryStatusEx(&memInfo); +@@ -155,7 +155,7 @@ int64_t celero::GetRAMSystemTotal() + + int64_t celero::GetRAMSystemAvailable() + { +-#ifdef WIN32 ++#ifdef _WIN32 + MEMORYSTATUSEX memInfo; + memInfo.dwLength = sizeof(MEMORYSTATUSEX); + GlobalMemoryStatusEx(&memInfo); +@@ -167,7 +167,7 @@ int64_t celero::GetRAMSystemAvailable() + + int64_t celero::GetRAMSystemUsed() + { +-#ifdef WIN32 ++#ifdef _WIN32 + return celero::GetRAMSystemTotal() - celero::GetRAMSystemAvailable(); + #elif defined(__APPLE__) + int mib[2]; +@@ -198,7 +198,7 @@ int64_t celero::GetRAMSystemUsed() + + int64_t celero::GetRAMSystemUsedByCurrentProcess() + { +-#ifdef WIN32 ++#ifdef _WIN32 + PROCESS_MEMORY_COUNTERS_EX pmc; + GetProcessMemoryInfo(GetCurrentProcess(), reinterpret_cast<PPROCESS_MEMORY_COUNTERS>(&pmc), sizeof(pmc)); + return static_cast<int64_t>(pmc.WorkingSetSize); +@@ -209,7 +209,7 @@ int64_t celero::GetRAMSystemUsedByCurrentProcess() + + int64_t celero::GetRAMPhysicalTotal() + { +-#ifdef WIN32 ++#ifdef _WIN32 + MEMORYSTATUSEX memInfo; + memInfo.dwLength = sizeof(MEMORYSTATUSEX); + GlobalMemoryStatusEx(&memInfo); +@@ -225,7 +225,7 @@ int64_t celero::GetRAMPhysicalTotal() + + int64_t celero::GetRAMPhysicalAvailable() + { +-#ifdef WIN32 ++#ifdef _WIN32 + MEMORYSTATUSEX memInfo; + memInfo.dwLength = sizeof(MEMORYSTATUSEX); + GlobalMemoryStatusEx(&memInfo); +@@ -237,7 +237,7 @@ int64_t celero::GetRAMPhysicalAvailable() + + int64_t celero::GetRAMPhysicalUsed() + { +-#ifdef WIN32 ++#ifdef _WIN32 + return celero::GetRAMPhysicalTotal() - celero::GetRAMPhysicalAvailable(); + #elif defined(__APPLE__) + struct rusage rusage; +@@ -252,7 +252,7 @@ int64_t celero::GetRAMPhysicalUsed() + + int64_t celero::GetRAMPhysicalUsedByCurrentProcess() + { +-#ifdef WIN32 ++#ifdef _WIN32 + PROCESS_MEMORY_COUNTERS_EX pmc; + GetProcessMemoryInfo(GetCurrentProcess(), reinterpret_cast<PPROCESS_MEMORY_COUNTERS>(&pmc), sizeof(pmc)); + return static_cast<int64_t>(pmc.WorkingSetSize); +@@ -306,7 +306,7 @@ int64_t celero::GetRAMPhysicalUsedByCurrentProcessPeak() + + int64_t celero::GetRAMVirtualTotal() + { +-#ifdef WIN32 ++#ifdef _WIN32 + MEMORYSTATUSEX memInfo; + memInfo.dwLength = sizeof(MEMORYSTATUSEX); + GlobalMemoryStatusEx(&memInfo); +@@ -322,7 +322,7 @@ int64_t celero::GetRAMVirtualTotal() + + int64_t celero::GetRAMVirtualAvailable() + { +-#ifdef WIN32 ++#ifdef _WIN32 + MEMORYSTATUSEX memInfo; + memInfo.dwLength = sizeof(MEMORYSTATUSEX); + GlobalMemoryStatusEx(&memInfo); +@@ -334,7 +334,7 @@ int64_t celero::GetRAMVirtualAvailable() + + int64_t celero::GetRAMVirtualUsed() + { +-#ifdef WIN32 ++#ifdef _WIN32 + return celero::GetRAMVirtualTotal() - celero::GetRAMVirtualAvailable(); + #elif defined(__APPLE__) + return -1; +@@ -348,7 +348,7 @@ int64_t celero::GetRAMVirtualUsed() + + int64_t celero::GetRAMVirtualUsedByCurrentProcess() + { +-#ifdef WIN32 ++#ifdef _WIN32 + PROCESS_MEMORY_COUNTERS_EX pmc; + GetProcessMemoryInfo(GetCurrentProcess(), reinterpret_cast<PPROCESS_MEMORY_COUNTERS>(&pmc), sizeof(pmc)); + return pmc.PrivateUsage; +diff --git a/src/Timer.cpp b/src/Timer.cpp +index 7792722..fa24e74 100644 +--- a/src/Timer.cpp ++++ b/src/Timer.cpp +@@ -20,7 +20,7 @@ + #include <celero/Timer.h> + #include <iostream> + +-#ifdef WIN32 ++#ifdef _WIN32 + #include <Windows.h> + LARGE_INTEGER QPCFrequency; + #else +@@ -29,7 +29,7 @@ LARGE_INTEGER QPCFrequency; + + uint64_t celero::timer::GetSystemTime() + { +-#ifdef WIN32 ++#ifdef _WIN32 + LARGE_INTEGER timeStorage; + QueryPerformanceCounter(&timeStorage); + if(QPCFrequency.QuadPart != 0) +@@ -46,7 +46,7 @@ uint64_t celero::timer::GetSystemTime() + + double celero::timer::CachePerformanceFrequency(bool quiet) + { +-#ifdef WIN32 ++#ifdef _WIN32 + QueryPerformanceFrequency(&QPCFrequency); + if(QPCFrequency.QuadPart == 0) + { +diff --git a/src/Utilities.cpp b/src/Utilities.cpp +index 6d9a266..0e4f1c4 100644 +--- a/src/Utilities.cpp ++++ b/src/Utilities.cpp +@@ -19,7 +19,7 @@ + #include <celero/Print.h> + #include <celero/Utilities.h> + +-#ifdef WIN32 ++#ifdef _WIN32 + #include <Windows.h> + + #include <PowrProf.h> diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index edcc6989e..364ec44b8 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -1,11 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF 83b592b134cb41e2e5611714bce0bf61413eb12b + REF 83b592b134cb41e2e5611714bce0bf61413eb12b #2.6.0 SHA512 3315b56467c17330f603c6710996c1a76f67068960b1356ca92db1ab23fca9f27a2dda9be521a19b88efc2e961095ee5523924b135d380681a4328c09d963e8c HEAD_REF master + PATCHES fix-win32-define.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CELERO_COMPILE_DYNAMIC_LIBRARIES) @@ -26,6 +25,10 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/celero/Export.h "ifdef CELERO_STATIC" "if 1") +endif() + file(RENAME ${CURRENT_PACKAGES_DIR}/share/celero/celero-target.cmake ${CURRENT_PACKAGES_DIR}/share/celero/celero-config.cmake) -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/celero RENAME copyright) +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index ab427a7dc..7d9514962 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 5.0.1 +Version: 5.0.2 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. diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 2e57e7689..04e327136 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -1,19 +1,18 @@ -include(vcpkg_common_functions) - vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF releases/CGAL-5.0.1 - SHA512 656e207bdc7003dd2e3e4b31b33f9ac3af5074e4892dda645f67fccdc0ac22982d8bf3c62f9c556847ba0447c14f79923712fc6320f8c10ea77e17bf77eb3e2f + REF releases/CGAL-5.0.2 + SHA512 108f1d6f68674e123fd90143049f30a7e7965827468828f75ba7ae0b7ba174690520bafdf0648853c1b28895d6a9a0c7349c03e678c13395a84ffe7397c97e99 HEAD_REF master ) set(WITH_CGAL_Qt5 OFF) -if("qt" IN_LIST FEATURES) - set(WITH_CGAL_Qt5 ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + qt WITH_CGAL_Qt5 + ) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -21,7 +20,7 @@ vcpkg_configure_cmake( OPTIONS -DCGAL_HEADER_ONLY=ON -DCGAL_INSTALL_CMAKE_DIR=share/cgal - -DWITH_CGAL_Qt5=${WITH_CGAL_Qt5} + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() @@ -46,8 +45,8 @@ endif() file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "include (\$\{CMAKE_CURRENT_LIST_DIR\}/../../share/cgal/CGALConfig.cmake)") -file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/cgal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cgal/copyright) + +file(INSTALL ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file( COPY @@ -59,4 +58,3 @@ file( ) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal) -vcpkg_test_cmake(PACKAGE_NAME CGAL) diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index 6f6a2a307..b0d8d59ed 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,8 +1,8 @@ Source: cpprestsdk -Version: 2.10.14-1 -Build-Depends: openssl (!uwp&!windows), boost-system (!uwp&!windows), +Version: 2.10.15 +Build-Depends: openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), - boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), + boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), boost-asio (!uwp&!windows) Homepage: https://github.com/Microsoft/cpprestsdk Description: C++11 JSON, REST, and OAuth library diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index 4a6dad142..8c76683c5 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.14 - SHA512 7208b8c31e42a9bda2bf1d5c65527e54e3f946ec57743aaf7058c12a311de78de354d5ff859f35b3a8936c8964ac5695a692e234f3365edc426cf9580f76cd4f + REF v2.10.15 + SHA512 ef8884c9f7fde2b6a25357ef0e7ee87b473a2e3140af2c5af0e3be7776ac2e8c0da431a356892020a3c37c84e30396350e2083cd4e1192a41fd3e099e74179f7 HEAD_REF master ) diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL index 66bcbb76b..b68d214c8 100644 --- a/ports/darknet/CONTROL +++ b/ports/darknet/CONTROL @@ -1,8 +1,7 @@ Source: darknet -Version: 0.2.5.1-1 +Version: 2020-03-02 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 diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index efbf26cde..51cb9f376 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -1,18 +1,8 @@ -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - message(FATAL_ERROR "darknet does not support ARM") -endif() - -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "darknet does not support UWP") -endif() - -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AlexeyAB/darknet - REF 35346d2ef80dc46b9eb4fba57da1737a49f4743e - SHA512 a905a5e42c4ecfdf2b8276fc565b82e30c97e249c0530b403d149a8e6276bb3852a956869c21efbe092799f3743cf529a577fb03275cfcfcc8322b92e9de0ff6 + REF 81290b07376c5abb4988a492dda70913bb90133d + SHA512 094197cde851dfdd1e102a3ffaed34d67a789dd75dc288bde611144dc9aa484ca0b9e3468abc297d075d3753553f7f09a214be279af9e58ccb642aa757909f79 HEAD_REF master ) @@ -110,22 +100,16 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(CMAKE_HOST_WIN32) - set(EXECUTABLE_SUFFIX ".exe") -else() - set(EXECUTABLE_SUFFIX "") -endif() - -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/darknet${EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/uselib${EXECUTABLE_SUFFIX}) -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/uselib_track${EXECUTABLE_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/uselib_track${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/darknet${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/uselib${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX}) endif() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/darknet${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/darknet${EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uselib${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/uselib${EXECUTABLE_SUFFIX}) -if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/uselib_track${EXECUTABLE_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uselib_track${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/uselib_track${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/darknet${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/darknet${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uselib${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/uselib${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/uselib_track${VCPKG_TARGET_EXECUTABLE_SUFFIX}) endif() file(COPY ${SOURCE_PATH}/cfg DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 37d61b70c..6704aba82 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,4 +1,4 @@ Source: doctest -Version: 2.3.6 +Version: 2.3.7 Homepage: https://github.com/onqtam/doctest Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 4f840343b..20fa192bb 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.3.6 - SHA512 e09d61331e9d7dc11e0c93f377c26f9fcac66c8bb5f02731028d396fb595770580c66b5e20b2dba4a203d9956637a0a8a1e43c63cc90452b103c3144e83dbc1e + REF 7d42bd0fab6c44010c8aed9338bd02bea5feba41 #version 2.3.7 + SHA512 4e71c8dd49a97ee2324207e063d47ce56cfb0371c0e855dd26ce4f169299f1710e4f30a9c5f16a078690c983e6ce7b6d5bb4fe9e0ec6be017905b2381a85b5a6 HEAD_REF master ) @@ -20,7 +18,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/doctest/copyright COPYONLY) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME ${PORT}) +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
\ No newline at end of file diff --git a/ports/eabase/CONTROL b/ports/eabase/CONTROL index 95c76477e..42fe96803 100644 --- a/ports/eabase/CONTROL +++ b/ports/eabase/CONTROL @@ -1,4 +1,4 @@ Source: eabase
-Version: 2.09.10
+Version: 2.09.12
Homepage: https://github.com/electronicarts/EABase
Description: Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.
diff --git a/ports/eabase/fix_cmake_install.patch b/ports/eabase/fix_cmake_install.patch index 2cd22690b..1a81fd69f 100644 --- a/ports/eabase/fix_cmake_install.patch +++ b/ports/eabase/fix_cmake_install.patch @@ -59,7 +59,7 @@ index 89c6703..ab8e553 100644 + + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake" -+ VERSION 2.09.10 ++ VERSION 2.09.12 + COMPATIBILITY SameMajorVersion + ) + diff --git a/ports/eabase/portfile.cmake b/ports/eabase/portfile.cmake index 1a70ad267..8a5e57dac 100644 --- a/ports/eabase/portfile.cmake +++ b/ports/eabase/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO electronicarts/EABase
- REF edbafca82e4c4e73302e0b5144c5d1f4710db9fa
- SHA512 fb9bd07602fb308864506737813212e47385a164708cd9064fdd4d1893294b228718a2964a0b16d04483f4f4c8a156f7199b60f227e4fc9ac88352f7dcd59672
+ REF d1be0a1d0fc01a9bf8f3f2cea75018df0d2410ee
+ SHA512 84a11bea06aecbf9a659d92b1ac904b99b2b82023650f4f376b5e68a744f631c5dbdd53d25f746ffb01b428415ac86e4fb8ba758db844acf80560fabe4d77733
HEAD_REF master
PATCHES
fix_cmake_install.patch
diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 2cb7f0009..156aac737 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,5 +1,5 @@ Source: eastl
-Version: 3.16.01
+Version: 3.16.05
Homepage: https://github.com/electronicarts/EASTL
Description: Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.
Build-Depends: eabase
diff --git a/ports/eastl/fix_cmake_install.patch b/ports/eastl/fix_cmake_install.patch index 3340adb1c..bc8433c07 100644 --- a/ports/eastl/fix_cmake_install.patch +++ b/ports/eastl/fix_cmake_install.patch @@ -56,7 +56,7 @@ index b8171cd..44120cc 100644 +
+write_basic_package_version_file(
+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake"
-+ VERSION 3.16.01
++ VERSION 3.16.05
+ COMPATIBILITY SameMajorVersion
+)
+
diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index 922fa2118..3a56d4f13 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO electronicarts/EASTL
- REF 3.16.01
- SHA512 c5c4b6637da5257e6dbbccd293a07691d509bf1310a67aa8b85777a1163f0034874e0638728a54deaa0839320fd919b67a8c9e22461fee6612a76637bb3086bc
+ REF 3.16.05
+ SHA512 6e5ab46e6238135996961860789b811bfd8e5a84431bc01572842d9326037be0aaec315bef0fa3c84fca0f70822e7c03ae481bc99400d11112321702c18b9918
HEAD_REF master
PATCHES
fix_cmake_install.patch
diff --git a/ports/eathread/CONTROL b/ports/eathread/CONTROL index a0eb50176..a01117645 100644 --- a/ports/eathread/CONTROL +++ b/ports/eathread/CONTROL @@ -1,5 +1,5 @@ Source: eathread
-Version: 1.32.09
+Version: 1.32.09-1
Homepage: https://github.com/electronicarts/EAThread
Description: Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.
Build-Depends: eabase, eastl
diff --git a/ports/eathread/portfile.cmake b/ports/eathread/portfile.cmake index 5c567140d..5d4d9669a 100644 --- a/ports/eathread/portfile.cmake +++ b/ports/eathread/portfile.cmake @@ -29,5 +29,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs()
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread)
diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL index 057c9da16..26905be97 100644 --- a/ports/entt/CONTROL +++ b/ports/entt/CONTROL @@ -1,4 +1,4 @@ Source: entt -Version: 3.2.2 +Version: 3.3.0 Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. Homepage: https://github.com/skypjack/entt diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 20c84d41c..98225cd03 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -1,11 +1,8 @@ -#header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF v3.2.2 - SHA512 231bd3c4300dbc6aaee31364e5e8a769f2c3ccd70bfbcc1315d782c21332e1d1f12367b14833cdfe4d90fc8e4ecd2424136ee29f4db36ebcebf1d41bb07bb250 + REF v3.3.0 + SHA512 98ce01a3a7b1d1fe4f9b3f2db6505944b811c63e968dded9c31c8ba18f00dbae701ccc387e38a4f65ee6d4e581a3686009adbd2286b6014a017a93fa43803cdf HEAD_REF master ) diff --git a/ports/farmhash/CONTROL b/ports/farmhash/CONTROL new file mode 100644 index 000000000..79cb6849a --- /dev/null +++ b/ports/farmhash/CONTROL @@ -0,0 +1,4 @@ +Source: farmhash +Version: 1.1 +Homepage: https://github.com/google/farmhash +Description: FarmHash, a family of hash functions. diff --git a/ports/farmhash/farmhashConfig.cmake b/ports/farmhash/farmhashConfig.cmake new file mode 100644 index 000000000..b7b4cd1b0 --- /dev/null +++ b/ports/farmhash/farmhashConfig.cmake @@ -0,0 +1,16 @@ +function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + set(${NAMESPACE}_${LIB_NAME}_FOUND 1) +endfunction() + +get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) + +set_library_target("GOOGLE" "farmhash" "${ROOT}/debug/lib/libfarmhash.a" "${ROOT}/lib/libfarmhash.a" "${ROOT}/include/") diff --git a/ports/farmhash/portfile.cmake b/ports/farmhash/portfile.cmake new file mode 100644 index 000000000..42aa80ceb --- /dev/null +++ b/ports/farmhash/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "Windows") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/farmhash + REF 0d859a811870d10f53a594927d0d0b97573ad06d + SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1 + HEAD_REF master +) + +set(FLAGS "-g -mavx -maes -O3") +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + CXXFLAGS=${FLAGS} +) + +vcpkg_install_make() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/farmhashConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
\ No newline at end of file diff --git a/ports/farmhash/usage b/ports/farmhash/usage new file mode 100644 index 000000000..6ec1706dc --- /dev/null +++ b/ports/farmhash/usage @@ -0,0 +1,4 @@ +The package farmhash is compatible with built-in CMake targets: + + FIND_PACKAGE(farmhash REQUIRED) + TARGET_LINK_LIBRARIES(main PRIVATE GOOGLE::farmhash) for linkage
\ No newline at end of file diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index fee79a66a..769995497 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2-4 +Version: 4.2-5 Build-Depends: zlib Homepage: https://ffmpeg.org Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index 1562fff05..bb4706985 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -51,7 +51,7 @@ endif() # Platform dependent libraries required by FFMPEG if(WIN32) if(NOT CYGWIN) - list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 Secur32 bcrypt) + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 secur32 bcrypt) endif() else() list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS m) diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index cdbb9362d..48f758b10 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,4 +1,4 @@ Source: fmt -Version: 6.0.0-1 +Version: 6.1.2 Homepage: https://github.com/fmtlib/fmt Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams. diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch index 9b52d4926..5c2537954 100644 --- a/ports/fmt/fix-warning4189.patch +++ b/ports/fmt/fix-warning4189.patch @@ -1,12 +1,12 @@ diff --git a/include/fmt/format.h b/include/fmt/format.h -index efec5d6..9b15b48 100644 +index 01f41f5c..208a58d0 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h -@@ -33,6 +33,7 @@ - #ifndef FMT_FORMAT_H_ - #define FMT_FORMAT_H_ - +@@ -35,6 +35,7 @@ + + #include "core.h" + +#pragma warning(disable:4189) #include <algorithm> - #include <cassert> + #include <cerrno> #include <cmath> diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 238272b86..bc21d97a3 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 6.0.0 - SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766 + REF 6.1.2 + SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7 HEAD_REF master PATCHES fix-warning4189.patch ) @@ -20,12 +20,16 @@ file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/shar if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll) + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll) + endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll) + endif() endif() endif() diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index b5f5d0ef8..b965efca1 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,5 +1,5 @@ Source: freetype -Version: 2.10.1-3 +Version: 2.10.1-4 Build-Depends: zlib Homepage: https://www.freetype.org/ Description: A library to render fonts. @@ -9,10 +9,6 @@ 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. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 1b8756a75..7efc6d430 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -19,11 +19,9 @@ vcpkg_extract_source_archive_ex( 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 ) diff --git a/ports/geotrans/CONTROL b/ports/geotrans/CONTROL index 4d04091f5..892959a9b 100644 --- a/ports/geotrans/CONTROL +++ b/ports/geotrans/CONTROL @@ -1,3 +1,3 @@ Source: geotrans -Version: 3.7-1 +Version: 3.8 Description: Geotrans is a library that allows you convert geographic coordinates among a wide variety of coordinate systems, map projections, and datums. diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake index d2b4104bd..39844c315 100644 --- a/ports/geotrans/portfile.cmake +++ b/ports/geotrans/portfile.cmake @@ -36,4 +36,4 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${P file(INSTALL ${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) # Install the geo model data -file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
\ No newline at end of file diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL index 011b631b4..9a7fd7e9c 100644 --- a/ports/glew/CONTROL +++ b/ports/glew/CONTROL @@ -1,4 +1,4 @@ Source: glew -Version: 2.1.0-6 +Version: 2.1.0-7 Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. Homepage: https://github.com/nigels-com/glew diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 796574df1..504a91dcf 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glew) +if(VCPKG_TARGET_IS_WINDOWS) set(_targets_cmake_files) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND _targets_cmake_files "${CURRENT_PACKAGES_DIR}/share/glew/glew-targets-debug.cmake") @@ -46,6 +47,7 @@ endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib) endif() +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt index b6bead6da..51ea75cd3 100644 --- a/ports/gmime/CMakeLists.txt +++ b/ports/gmime/CMakeLists.txt @@ -17,6 +17,7 @@ if(MSVC) endif() add_definitions(-DHAVE_CONFIG_H) +add_definitions(-DG_DISABLE_DEPRECATED) add_definitions(-DG_LOG_DOMAIN="GMime") # Source files diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL index 2b1a9842f..c22fa3f60 100644 --- a/ports/gmime/CONTROL +++ b/ports/gmime/CONTROL @@ -1,5 +1,5 @@ Source: gmime -Version: 3.2.3-1 +Version: 3.2.6 Build-Depends: zlib, glib, libiconv, libidn2 Homepage: https://developer.gnome.org/gmime/ Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME). diff --git a/ports/gmime/config.h b/ports/gmime/config.h deleted file mode 100644 index a53c1537a..000000000 --- a/ports/gmime/config.h +++ /dev/null @@ -1,184 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if GMime should enable GpgME PGP and S/MIME support. */ -/* #undef ENABLE_CRYPTO */ - -/* Define if GMime should enable warning output. */ -/* #undef ENABLE_WARNINGS */ - -/* Define to the GMime version */ -#define GMIME_VERSION "@LIB_VERSION@" - -/* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the `fsync' function. */ -/* #undef HAVE_FSYNC */ - -/* Define to 1 if you have the `getaddrinfo' function. */ -#define HAVE_GETADDRINFO 1 - -/* Define to 1 if you have the `getdomainname' function. */ -/* #undef HAVE_GETDOMAINNAME */ - -/* Define to 1 if you have the `gethostname' function. */ -#define HAVE_GETHOSTNAME 1 - -/* Define to 1 if you have the <getopt.h> header with the GNU `getopt_long' - function. */ -#define HAVE_GETOPT_H 1 - -/* Define to 1 if you have the `getpagesize' function. */ -/* #undef HAVE_GETPAGESIZE */ - -/* Define to 1 to use auto-detected iconv-friendly charset names. */ -/* #undef HAVE_ICONV_DETECT_H */ - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `msync' function. */ -/* #undef HAVE_MSYNC */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef HAVE_MUNMAP */ - -/* Define to 1 if you have the <netdb.h> header file. */ -/* #undef HAVE_NETDB_H */ - -/* Define to 1 if you have the `poll' function. */ -/* #undef HAVE_POLL */ - -/* Define to 1 if you have the <poll.h> header file. */ -/* #undef HAVE_POLL_H */ - -/* Define to 1 if you have the `select' function. */ -/* #undef HAVE_SELECT */ - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the <strings.h> header file. */ -/* #undef HAVE_STRINGS_H */ - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the <sys/mman.h> header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the <sys/param.h> header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the <time.h> header file. */ -#define HAVE_TIME_H 1 - -/* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* Define if struct utsname has a domainname member */ -/* #undef HAVE_UTSNAME_DOMAINNAME */ - -/* Define to 1 if you have the <winsock2.h> header file. */ -#define HAVE_WINSOCK2_H 1 - -/* Define to 1 if GNU Libidn should be used. */ -#define LIBIDN 1 - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Define with a value if your <sys/param.h> does not define MAXHOSTNAMELEN */ -/* #undef MAXHOSTNAMELEN */ - -/* Define to 0 if your system does not have the O_LARGEFILE flag */ -/* #undef O_LARGEFILE */ - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://github.com/jstedfast/gmime/issues" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "gmime" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gmime @LIB_VERSION@" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "gmime" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "@LIB_VERSION@" - -/* The size of `off_t', as computed by sizeof. */ -/* #undef SIZEOF_OFF_T */ - -/* The size of `size_t', as computed by sizeof. */ -/* #undef SIZEOF_SIZE_T */ - -/* The size of `ssize_t', as computed by sizeof. */ -/* #undef SIZEOF_SSIZE_T */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Using GNU libiconv */ -/* #undef USE_LIBICONV_GNU */ - -/* Using a native implementation of iconv in a separate library */ -#define USE_LIBICONV_NATIVE 1 - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#define inline __inline -#endif - -/* Define to `int' if <sys/types.h> does not define. */ -/* #undef mode_t */ - -/* Define to `unsigned long int' if <poll.h> does not define. */ -/* #undef nfds_t */ - -/* Define to `long int' if <sys/types.h> does not define. */ -/* #undef off_t */ - -/* Define to `unsigned int' if <sys/types.h> does not define. */ -/* #undef size_t */ - -/* Define to `int' if <sys/types.h> does not define. */ -#define ssize_t intptr_t - -#ifdef _MSC_VER -#pragma warning(disable: 4018) -#pragma warning(disable: 4101) -#endif diff --git a/ports/gmime/gmime.def b/ports/gmime/gmime.def deleted file mode 100644 index 3f04d4e04..000000000 --- a/ports/gmime/gmime.def +++ /dev/null @@ -1,636 +0,0 @@ -EXPORTS - -g_mime_application_pkcs7_mime_decrypt -g_mime_application_pkcs7_mime_encrypt -g_mime_application_pkcs7_mime_get_smime_type -g_mime_application_pkcs7_mime_get_type -g_mime_application_pkcs7_mime_new -g_mime_application_pkcs7_mime_sign -g_mime_application_pkcs7_mime_verify -g_mime_certificate_get_created -g_mime_certificate_get_digest_algo -g_mime_certificate_get_email -g_mime_certificate_get_expires -g_mime_certificate_get_fingerprint -g_mime_certificate_get_id_validity -g_mime_certificate_get_issuer_name -g_mime_certificate_get_issuer_serial -g_mime_certificate_get_key_id -g_mime_certificate_get_name -g_mime_certificate_get_pubkey_algo -g_mime_certificate_get_trust -g_mime_certificate_get_type -g_mime_certificate_get_user_id -g_mime_certificate_list_add -g_mime_certificate_list_clear -g_mime_certificate_list_contains -g_mime_certificate_list_get_certificate -g_mime_certificate_list_get_type -g_mime_certificate_list_index_of -g_mime_certificate_list_insert -g_mime_certificate_list_length -g_mime_certificate_list_new -g_mime_certificate_list_remove -g_mime_certificate_list_remove_at -g_mime_certificate_list_set_certificate -g_mime_certificate_new -g_mime_certificate_set_created -g_mime_certificate_set_digest_algo -g_mime_certificate_set_email -g_mime_certificate_set_expires -g_mime_certificate_set_fingerprint -g_mime_certificate_set_id_validity -g_mime_certificate_set_issuer_name -g_mime_certificate_set_issuer_serial -g_mime_certificate_set_key_id -g_mime_certificate_set_name -g_mime_certificate_set_pubkey_algo -g_mime_certificate_set_trust -g_mime_certificate_set_user_id -g_mime_charset_best -g_mime_charset_best_name -g_mime_charset_can_encode -g_mime_charset_canon_name -g_mime_charset_iconv_name -g_mime_charset_init -g_mime_charset_iso_to_windows -g_mime_charset_language -g_mime_charset_locale_name -g_mime_charset_map_init -g_mime_charset_map_shutdown -g_mime_charset_name -g_mime_charset_step -g_mime_check_version -g_mime_content_disposition_encode -g_mime_content_disposition_get_disposition -g_mime_content_disposition_get_parameter -g_mime_content_disposition_get_parameters -g_mime_content_disposition_get_type -g_mime_content_disposition_is_attachment -g_mime_content_disposition_new -g_mime_content_disposition_parse -g_mime_content_disposition_set_disposition -g_mime_content_disposition_set_parameter -g_mime_content_encoding_from_string -g_mime_content_encoding_to_string -g_mime_content_type_encode -g_mime_content_type_get_media_subtype -g_mime_content_type_get_media_type -g_mime_content_type_get_mime_type -g_mime_content_type_get_parameter -g_mime_content_type_get_parameters -g_mime_content_type_get_type -g_mime_content_type_is_type -g_mime_content_type_new -g_mime_content_type_parse -g_mime_content_type_set_media_subtype -g_mime_content_type_set_media_type -g_mime_content_type_set_parameter -g_mime_crypto_context_decrypt -g_mime_crypto_context_digest_id -g_mime_crypto_context_digest_name -g_mime_crypto_context_encrypt -g_mime_crypto_context_export_keys -g_mime_crypto_context_get_encryption_protocol -g_mime_crypto_context_get_key_exchange_protocol -g_mime_crypto_context_get_request_password -g_mime_crypto_context_get_signature_protocol -g_mime_crypto_context_get_type -g_mime_crypto_context_import_keys -g_mime_crypto_context_new -g_mime_crypto_context_register -g_mime_crypto_context_set_request_password -g_mime_crypto_context_shutdown -g_mime_crypto_context_sign -g_mime_crypto_context_verify -g_mime_data_wrapper_get_encoding -g_mime_data_wrapper_get_stream -g_mime_data_wrapper_get_type -g_mime_data_wrapper_new -g_mime_data_wrapper_new_with_stream -g_mime_data_wrapper_set_encoding -g_mime_data_wrapper_set_stream -g_mime_data_wrapper_write_to_stream -g_mime_decrypt_result_get_cipher -g_mime_decrypt_result_get_mdc -g_mime_decrypt_result_get_recipients -g_mime_decrypt_result_get_session_key -g_mime_decrypt_result_get_signatures -g_mime_decrypt_result_get_type -g_mime_decrypt_result_new -g_mime_decrypt_result_set_cipher -g_mime_decrypt_result_set_mdc -g_mime_decrypt_result_set_recipients -g_mime_decrypt_result_set_session_key -g_mime_decrypt_result_set_signatures -g_mime_encoding_base64_decode_step -g_mime_encoding_base64_encode_close -g_mime_encoding_base64_encode_step -g_mime_encoding_flush -g_mime_encoding_init_decode -g_mime_encoding_init_encode -g_mime_encoding_outlen -g_mime_encoding_quoted_decode_step -g_mime_encoding_quoted_encode_close -g_mime_encoding_quoted_encode_step -g_mime_encoding_reset -g_mime_encoding_step -g_mime_encoding_uudecode_step -g_mime_encoding_uuencode_close -g_mime_encoding_uuencode_step -g_mime_filter_backup -g_mime_filter_basic_get_type -g_mime_filter_basic_new -g_mime_filter_best_charset -g_mime_filter_best_encoding -g_mime_filter_best_get_type -g_mime_filter_best_new -g_mime_filter_charset_get_type -g_mime_filter_charset_new -g_mime_filter_checksum_get_digest -g_mime_filter_checksum_get_string -g_mime_filter_checksum_get_type -g_mime_filter_checksum_new -g_mime_filter_complete -g_mime_filter_copy -g_mime_filter_dos2unix_get_type -g_mime_filter_dos2unix_new -g_mime_filter_enriched_get_type -g_mime_filter_enriched_new -g_mime_filter_filter -g_mime_filter_from_get_type -g_mime_filter_from_new -g_mime_filter_get_type -g_mime_filter_gzip_get_comment -g_mime_filter_gzip_get_filename -g_mime_filter_gzip_get_type -g_mime_filter_gzip_new -g_mime_filter_gzip_set_comment -g_mime_filter_gzip_set_filename -g_mime_filter_html_get_type -g_mime_filter_html_new -g_mime_filter_openpgp_new -g_mime_filter_openpgp_get_data_type -g_mime_filter_openpgp_get_begin_offset -g_mime_filter_openpgp_get_end_offset -g_mime_filter_openpgp_get_type -g_mime_filter_reset -g_mime_filter_set_size -g_mime_filter_smtp_data_get_type -g_mime_filter_smtp_data_new -g_mime_filter_strip_get_type -g_mime_filter_strip_new -g_mime_filter_unix2dos_get_type -g_mime_filter_unix2dos_new -g_mime_filter_windows_get_type -g_mime_filter_windows_is_windows_charset -g_mime_filter_windows_new -g_mime_filter_windows_real_charset -g_mime_filter_yenc_get_crc -g_mime_filter_yenc_get_pcrc -g_mime_filter_yenc_get_type -g_mime_filter_yenc_new -g_mime_filter_yenc_set_crc -g_mime_filter_yenc_set_state -g_mime_format_options_add_hidden_header -g_mime_format_options_clear_hidden_headers -g_mime_format_options_clone -g_mime_format_options_create_newline_filter -g_mime_format_options_free -g_mime_format_options_get_default -g_mime_format_options_get_newline -g_mime_format_options_get_newline_format -g_mime_format_options_get_param_encoding_method -g_mime_format_options_get_type -g_mime_format_options_is_hidden_header -g_mime_format_options_new -g_mime_format_options_remove_hidden_header -g_mime_format_options_set_newline_format -g_mime_format_options_set_param_encoding_method -g_mime_gpg_context_get_type -g_mime_gpg_context_new -g_mime_header_format_addrlist -g_mime_header_format_content_disposition -g_mime_header_format_content_type -g_mime_header_format_default -g_mime_header_format_message_id -g_mime_header_format_received -g_mime_header_format_references -g_mime_header_get_name -g_mime_header_get_offset -g_mime_header_get_raw_name -g_mime_header_get_raw_value -g_mime_header_get_type -g_mime_header_get_value -g_mime_header_list_append -g_mime_header_list_clear -g_mime_header_list_contains -g_mime_header_list_get_count -g_mime_header_list_get_header -g_mime_header_list_get_header_at -g_mime_header_list_get_type -g_mime_header_list_new -g_mime_header_list_prepend -g_mime_header_list_remove -g_mime_header_list_remove_at -g_mime_header_list_set -g_mime_header_list_to_string -g_mime_header_list_write_to_stream -g_mime_header_set_raw_value -g_mime_header_set_value -g_mime_header_write_to_stream -g_mime_iconv_close -g_mime_iconv_locale_to_utf8 -g_mime_iconv_locale_to_utf8_length -g_mime_iconv_open -g_mime_iconv_strdup -g_mime_iconv_strndup -g_mime_iconv_utf8_to_locale -g_mime_iconv_utf8_to_locale_length -g_mime_init -g_mime_locale_charset -g_mime_locale_language -g_mime_message_add_mailbox -g_mime_message_foreach -g_mime_message_get_addresses -g_mime_message_get_all_recipients -g_mime_message_get_autocrypt_gossip_headers -g_mime_message_get_autocrypt_gossip_headers_from_inner_part -g_mime_message_get_autocrypt_header -g_mime_message_get_bcc -g_mime_message_get_body -g_mime_message_get_cc -g_mime_message_get_date -g_mime_message_get_from -g_mime_message_get_message_id -g_mime_message_get_mime_part -g_mime_message_get_reply_to -g_mime_message_get_sender -g_mime_message_get_subject -g_mime_message_get_to -g_mime_message_get_type -g_mime_message_new -g_mime_message_part_get_message -g_mime_message_part_get_type -g_mime_message_part_new -g_mime_message_part_new_with_message -g_mime_message_part_set_message -g_mime_message_partial_get_id -g_mime_message_partial_get_number -g_mime_message_partial_get_total -g_mime_message_partial_get_type -g_mime_message_partial_new -g_mime_message_partial_reconstruct_message -g_mime_message_partial_split_message -g_mime_message_set_date -g_mime_message_set_message_id -g_mime_message_set_mime_part -g_mime_message_set_subject -g_mime_multipart_add -g_mime_multipart_clear -g_mime_multipart_contains -g_mime_multipart_encrypted_decrypt -g_mime_multipart_encrypted_encrypt -g_mime_multipart_encrypted_get_type -g_mime_multipart_encrypted_new -g_mime_multipart_foreach -g_mime_multipart_get_boundary -g_mime_multipart_get_count -g_mime_multipart_get_epilogue -g_mime_multipart_get_part -g_mime_multipart_get_prologue -g_mime_multipart_get_subpart_from_content_id -g_mime_multipart_get_type -g_mime_multipart_index_of -g_mime_multipart_insert -g_mime_multipart_new -g_mime_multipart_new_with_subtype -g_mime_multipart_remove -g_mime_multipart_remove_at -g_mime_multipart_replace -g_mime_multipart_set_boundary -g_mime_multipart_set_epilogue -g_mime_multipart_set_prologue -g_mime_multipart_signed_get_type -g_mime_multipart_signed_new -g_mime_multipart_signed_sign -g_mime_multipart_signed_verify -g_mime_object_append_header -g_mime_object_encode -g_mime_object_get_content_disposition -g_mime_object_get_content_disposition_parameter -g_mime_object_get_content_id -g_mime_object_get_content_type -g_mime_object_get_content_type_parameter -g_mime_object_get_disposition -g_mime_object_get_header -g_mime_object_get_header_list -g_mime_object_get_headers -g_mime_object_get_type -g_mime_object_new -g_mime_object_new_type -g_mime_object_prepend_header -g_mime_object_register_type -g_mime_object_remove_header -g_mime_object_set_content_disposition -g_mime_object_set_content_disposition_parameter -g_mime_object_set_content_id -g_mime_object_set_content_type -g_mime_object_set_content_type_parameter -g_mime_object_set_disposition -g_mime_object_set_header -g_mime_object_to_string -g_mime_object_write_to_stream -g_mime_param_get_charset -g_mime_param_get_encoding_method -g_mime_param_get_lang -g_mime_param_get_name -g_mime_param_get_type -g_mime_param_get_value -g_mime_param_list_clear -g_mime_param_list_encode -g_mime_param_list_get_parameter -g_mime_param_list_get_parameter_at -g_mime_param_list_get_type -g_mime_param_list_length -g_mime_param_list_new -g_mime_param_list_parse -g_mime_param_list_remove -g_mime_param_list_remove_at -g_mime_param_list_set_parameter -g_mime_param_set_charset -g_mime_param_set_encoding_method -g_mime_param_set_lang -g_mime_param_set_value -g_mime_parser_construct_message -g_mime_parser_construct_part -g_mime_parser_eos -g_mime_parser_get_format -g_mime_parser_get_headers_begin -g_mime_parser_get_headers_end -g_mime_parser_get_mbox_marker -g_mime_parser_get_mbox_marker_offset -g_mime_parser_get_persist_stream -g_mime_parser_get_respect_content_length -g_mime_parser_get_type -g_mime_parser_init_with_stream -g_mime_parser_new -g_mime_parser_new_with_stream -g_mime_parser_options_clone -g_mime_parser_options_free -g_mime_parser_options_get_address_compliance_mode -g_mime_parser_options_get_allow_addresses_without_domain -g_mime_parser_options_get_default -g_mime_parser_options_get_fallback_charsets -g_mime_parser_options_get_parameter_compliance_mode -g_mime_parser_options_get_rfc2047_compliance_mode -g_mime_parser_options_get_type -g_mime_parser_options_get_warning_callback -g_mime_parser_options_new -g_mime_parser_options_set_address_compliance_mode -g_mime_parser_options_set_allow_addresses_without_domain -g_mime_parser_options_set_fallback_charsets -g_mime_parser_options_set_parameter_compliance_mode -g_mime_parser_options_set_rfc2047_compliance_mode -g_mime_parser_options_set_warning_callback -g_mime_parser_set_format -g_mime_parser_set_header_regex -g_mime_parser_set_persist_stream -g_mime_parser_set_respect_content_length -g_mime_parser_tell -g_mime_part_get_best_content_encoding -g_mime_part_get_content -g_mime_part_get_content_description -g_mime_part_get_content_encoding -g_mime_part_get_content_id -g_mime_part_get_content_location -g_mime_part_get_content_md5 -g_mime_part_get_filename -g_mime_part_get_openpgp_data -g_mime_part_get_type -g_mime_part_is_attachment -g_mime_part_iter_clone -g_mime_part_iter_free -g_mime_part_iter_get_current -g_mime_part_iter_get_parent -g_mime_part_iter_get_path -g_mime_part_iter_get_toplevel -g_mime_part_iter_get_type -g_mime_part_iter_is_valid -g_mime_part_iter_jump_to -g_mime_part_iter_new -g_mime_part_iter_next -g_mime_part_iter_prev -g_mime_part_iter_remove -g_mime_part_iter_replace -g_mime_part_iter_reset -g_mime_part_new -g_mime_part_new_with_type -g_mime_part_openpgp_decrypt -g_mime_part_openpgp_encrypt -g_mime_part_openpgp_sign -g_mime_part_openpgp_verify -g_mime_part_set_content -g_mime_part_set_content_description -g_mime_part_set_content_encoding -g_mime_part_set_content_id -g_mime_part_set_content_location -g_mime_part_set_content_md5 -g_mime_part_set_filename -g_mime_part_set_openpgp_data -g_mime_part_verify_content_md5 -g_mime_pkcs7_context_get_type -g_mime_pkcs7_context_new -g_mime_references_append -g_mime_references_clear -g_mime_references_copy -g_mime_references_free -g_mime_references_get_message_id -g_mime_references_get_type -g_mime_references_length -g_mime_references_new -g_mime_references_parse -g_mime_references_set_message_id -g_mime_shutdown -g_mime_signature_get_certificate -g_mime_signature_get_created -g_mime_signature_get_expires -g_mime_signature_get_status -g_mime_signature_get_type -g_mime_signature_list_add -g_mime_signature_list_clear -g_mime_signature_list_contains -g_mime_signature_list_get_signature -g_mime_signature_list_get_type -g_mime_signature_list_index_of -g_mime_signature_list_insert -g_mime_signature_list_length -g_mime_signature_list_new -g_mime_signature_list_remove -g_mime_signature_list_remove_at -g_mime_signature_list_set_signature -g_mime_signature_new -g_mime_signature_set_certificate -g_mime_signature_set_created -g_mime_signature_set_expires -g_mime_signature_set_status -g_mime_stream_buffer_get_type -g_mime_stream_buffer_gets -g_mime_stream_buffer_new -g_mime_stream_buffer_readln -g_mime_stream_cat_add_source -g_mime_stream_cat_get_type -g_mime_stream_cat_new -g_mime_stream_close -g_mime_stream_construct -g_mime_stream_eos -g_mime_stream_file_get_owner -g_mime_stream_file_get_type -g_mime_stream_file_new -g_mime_stream_file_new_with_bounds -g_mime_stream_file_open -g_mime_stream_file_set_owner -g_mime_stream_filter_add -g_mime_stream_filter_get_owner -g_mime_stream_filter_get_type -g_mime_stream_filter_new -g_mime_stream_filter_remove -g_mime_stream_filter_set_owner -g_mime_stream_flush -g_mime_stream_fs_get_owner -g_mime_stream_fs_get_type -g_mime_stream_fs_new -g_mime_stream_fs_new_with_bounds -g_mime_stream_fs_open -g_mime_stream_fs_set_owner -g_mime_stream_get_type -g_mime_stream_gio_get_owner -g_mime_stream_gio_get_type -g_mime_stream_gio_new -g_mime_stream_gio_new_with_bounds -g_mime_stream_gio_set_owner -g_mime_stream_length -g_mime_stream_mem_get_byte_array -g_mime_stream_mem_get_owner -g_mime_stream_mem_get_type -g_mime_stream_mem_new -g_mime_stream_mem_new_with_buffer -g_mime_stream_mem_new_with_byte_array -g_mime_stream_mem_set_byte_array -g_mime_stream_mem_set_owner -g_mime_stream_mmap_get_owner -g_mime_stream_mmap_get_type -g_mime_stream_mmap_new -g_mime_stream_mmap_new_with_bounds -g_mime_stream_mmap_set_owner -g_mime_stream_null_set_count_newlines -g_mime_stream_null_get_count_newlines -g_mime_stream_null_get_type -g_mime_stream_null_new -g_mime_stream_pipe_get_owner -g_mime_stream_pipe_get_type -g_mime_stream_pipe_new -g_mime_stream_pipe_set_owner -g_mime_stream_printf -g_mime_stream_read -g_mime_stream_reset -g_mime_stream_seek -g_mime_stream_set_bounds -g_mime_stream_substream -g_mime_stream_tell -g_mime_stream_write -g_mime_stream_write_string -g_mime_stream_write_to_stream -g_mime_stream_writev -g_mime_text_part_get_charset -g_mime_text_part_get_text -g_mime_text_part_get_type -g_mime_text_part_new -g_mime_text_part_new_with_subtype -g_mime_text_part_set_charset -g_mime_text_part_set_text -g_mime_utils_best_encoding -g_mime_utils_decode_8bit -g_mime_utils_decode_message_id -g_mime_utils_generate_message_id -g_mime_utils_header_decode_date -g_mime_utils_header_decode_phrase -g_mime_utils_header_decode_text -g_mime_utils_header_encode_phrase -g_mime_utils_header_encode_text -g_mime_utils_header_format_date -g_mime_utils_header_printf -g_mime_utils_header_unfold -g_mime_utils_quote_string -g_mime_utils_structured_header_fold -g_mime_utils_text_is_8bit -g_mime_utils_unquote_string -g_mime_utils_unstructured_header_fold -g_mime_ydecode_step -g_mime_yencode_close -g_mime_yencode_step -gmime_binary_age -gmime_error_quark -gmime_gpgme_error_quark -gmime_interface_age -gmime_major_version -gmime_micro_version -gmime_minor_version -internet_address_get_charset -internet_address_get_name -internet_address_get_type -internet_address_group_add_member -internet_address_group_get_members -internet_address_group_get_type -internet_address_group_new -internet_address_group_set_members -internet_address_list_add -internet_address_list_append -internet_address_list_clear -internet_address_list_contains -internet_address_list_encode -internet_address_list_get_address -internet_address_list_get_type -internet_address_list_index_of -internet_address_list_insert -internet_address_list_length -internet_address_list_new -internet_address_list_parse -internet_address_list_prepend -internet_address_list_remove -internet_address_list_remove_at -internet_address_list_set_address -internet_address_list_to_string -internet_address_mailbox_get_addr -internet_address_mailbox_get_idn_addr -internet_address_mailbox_get_type -internet_address_mailbox_new -internet_address_mailbox_set_addr -internet_address_set_charset -internet_address_set_name -internet_address_to_string -g_mime_autocrypt_header_new -g_mime_autocrypt_header_new_from_string -g_mime_autocrypt_header_get_address -g_mime_autocrypt_header_set_address -g_mime_autocrypt_header_set_address_from_string -g_mime_autocrypt_header_get_address_as_string -g_mime_autocrypt_header_get_prefer_encrypt -g_mime_autocrypt_header_set_prefer_encrypt -g_mime_autocrypt_header_get_keydata -g_mime_autocrypt_header_set_keydata -g_mime_autocrypt_header_get_effective_date -g_mime_autocrypt_header_set_effective_date -g_mime_autocrypt_header_is_complete -g_mime_autocrypt_header_to_string -g_mime_autocrypt_header_compare -g_mime_autocrypt_header_clone -g_mime_autocrypt_header_list_new -g_mime_autocrypt_header_list_add_missing_addresses -g_mime_autocrypt_header_list_add -g_mime_autocrypt_header_list_get_count -g_mime_autocrypt_header_list_get_header_at -g_mime_autocrypt_header_list_get_header_for_address -g_mime_autocrypt_header_list_remove_incomplete -g_mime_autocrypt_header_get_type -g_mime_autocrypt_header_list_get_type diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index 29dcd68b0..524bd78c9 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -1,14 +1,14 @@ include(vcpkg_common_functions) set(LIB_NAME gmime) -set(LIB_VERSION 3.2.3) +set(LIB_VERSION 3.2.6) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.xz) vcpkg_download_distfile(ARCHIVE URLS "https://download.gnome.org/sources/gmime/3.2/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4 + SHA512 a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d ) vcpkg_extract_source_archive_ex( @@ -20,10 +20,9 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) # We can use file supplied with original sources -configure_file(${SOURCE_PATH}/build/vs2010/unistd.h ${SOURCE_PATH} COPYONLY) - -configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH}) -configure_file(${CMAKE_CURRENT_LIST_DIR}/gmime.def ${SOURCE_PATH} COPYONLY) +configure_file(${SOURCE_PATH}/build/vs2017/unistd.h ${SOURCE_PATH} COPYONLY) +configure_file(${SOURCE_PATH}/build/vs2017/config.h ${SOURCE_PATH} COPYONLY) +configure_file(${SOURCE_PATH}/build/vs2017/gmime.def ${SOURCE_PATH} COPYONLY) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/google-cloud-cpp-common/CONTROL b/ports/google-cloud-cpp-common/CONTROL index 21aa80979..f3df2b43d 100644 --- a/ports/google-cloud-cpp-common/CONTROL +++ b/ports/google-cloud-cpp-common/CONTROL @@ -1,5 +1,5 @@ Source: google-cloud-cpp-common -Version: 0.18.0 +Version: 0.21.0 Build-Depends: grpc, googleapis Description: Base C++ Libraries for Google Cloud Platform APIs Homepage: https://github.com/googleapis/google-cloud-cpp-common diff --git a/ports/google-cloud-cpp-common/portfile.cmake b/ports/google-cloud-cpp-common/portfile.cmake index b8dd30b94..731e298e8 100644 --- a/ports/google-cloud-cpp-common/portfile.cmake +++ b/ports/google-cloud-cpp-common/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp-common - REF v0.18.0 - SHA512 030e9574b97667cf3495d206fe21fe6bdf0a2c84f31240c5cfcb82a9db6df77ccb15e000d1f1e56d8dd2a8231c97ed0d0a10c89baf147bc6408a8be2cb452f25 + REF v0.21.0 + SHA512 a339c6f57ac539f1c45f2fb92311e5d48e29a4406a1e0cfda2f1dc18e8c6db345588ad0bebd2c23531e572982d4429ee73b4f0c3df1ba8028d4100d9b12ecaa1 HEAD_REF master) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/google-cloud-cpp-spanner/CONTROL b/ports/google-cloud-cpp-spanner/CONTROL index 5014bc7c1..952e68aea 100644 --- a/ports/google-cloud-cpp-spanner/CONTROL +++ b/ports/google-cloud-cpp-spanner/CONTROL @@ -1,5 +1,5 @@ Source: google-cloud-cpp-spanner
-Version: 0.7.0
+Version: 0.9.0
Build-Depends: grpc, googleapis, google-cloud-cpp-common
Description: C++ Client Library for Google Cloud Spanner.
Homepage: https://github.com/googleapis/google-cloud-cpp-spanner
diff --git a/ports/google-cloud-cpp-spanner/portfile.cmake b/ports/google-cloud-cpp-spanner/portfile.cmake index 8d2ff27ce..8cb9aca40 100644 --- a/ports/google-cloud-cpp-spanner/portfile.cmake +++ b/ports/google-cloud-cpp-spanner/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp-spanner - REF v0.7.0 - SHA512 f3fea6ebe3431102c23737822d17e90d4d301f5854ec17834ee379013c92b1997ff10421ee5f82e35b651cd930dbb8d73e9aad50b754b3fe1395257fa4199dfb + REF v0.9.0 + SHA512 2a53489c266d85ef9f03d747c088edd4401db1d01ba6c79862c9ccedaee39993941772e59ed5d697b61d05438e0c89c512e50def59fd0ef4fb0359c6bdff7324 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index d86f5be82..2075c8942 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,5 +1,5 @@ Source: google-cloud-cpp -Version: 0.18.0 +Version: 0.20.0 Build-Depends: grpc, curl[ssl], crc32c, googleapis, google-cloud-cpp-common Description: C++ Client Libraries for Google Cloud Platform APIs. Homepage: https://github.com/googleapis/google-cloud-cpp diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index a4c1d2203..addfaf196 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v0.18.0 - SHA512 e0678d928ccf5fe2f9ce8828091fb8e2b7d4c1ff41e347eb4bc8768d33997621693a2acf2a68fa11bfecf8f7f44fc95d15e59188b86769592cebcb3cf14cbd14 + REF v0.20.0 + SHA512 6e760f56186ee4bf2fca0e8e4e031e8a508a1e820a470513912e8e0bbcd7855cc1d7834f855a7d5b040492241d6cae1e27117d1de46fb3167c962d700c905be2 HEAD_REF master PATCHES 0001-fix-x86-build.patch diff --git a/ports/googleapis/CONTROL b/ports/googleapis/CONTROL index 21a890f98..a692293cb 100644 --- a/ports/googleapis/CONTROL +++ b/ports/googleapis/CONTROL @@ -1,5 +1,5 @@ Source: googleapis -Version: 0.4.1 +Version: 0.5.0 Build-Depends: grpc, protobuf Description: C++ Proto Libraries for Google APIs. Homepage: https://github.com/googleapis/cpp-cmakefiles diff --git a/ports/googleapis/portfile.cmake b/ports/googleapis/portfile.cmake index c445ec3f4..e56ec3da5 100644 --- a/ports/googleapis/portfile.cmake +++ b/ports/googleapis/portfile.cmake @@ -1,14 +1,12 @@ -if (VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Package `googleapis` doesn't support UWP") -endif() +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/cpp-cmakefiles - REF v0.4.1 - SHA512 b854833b74ae10aa249ee3926f0faa766a2d9dc82283a33d21b6e933a6b1feee0b0ba711f258b2a9face0de0f4f5e7bb87230fb8dd45ba7be279903ee00c1d8a + REF v0.5.0 + SHA512 8c552e9d2ad8341036464945c37a663a1135c97044fa9e70e372e9179515232d14725352c8c4b171d6b845c3a9273cecdbedc11e8e5cc08361ef03a608e3c025 HEAD_REF master ) diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL index cd7d3b850..e968e3adf 100644 --- a/ports/graphicsmagick/CONTROL +++ b/ports/graphicsmagick/CONTROL @@ -1,5 +1,5 @@ Source: graphicsmagick -Version: 1.3.34 +Version: 1.3.35 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff Homepage: https://sourceforge.net/projects/graphicsmagick/ Description: Image processing library diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index 22b148827..2d1d0a258 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -1,9 +1,9 @@ -set(GM_VERSION 1.3.34) +set(GM_VERSION 1.3.35) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z" FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z" - SHA512 bc770070d3e6b58ded1932050c1aa9f31edd89ac68e12055d7bb481ba9aa8e7509e69ad676a1624c262f9b55c0ceeea738b807005946ddd97b88d49b39b8a073 + SHA512 bf3ade807de54f366e49df5b754d8321978d8e1ed4275364fb7e861ff04f0780a698fcb4e0a110a45213209ff846034f2add00a3443ed31db2c842530199bd1f ) vcpkg_extract_source_archive_ex( diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 96ead2c98..24e6bd04a 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,5 +1,5 @@ Source: grpc -Version: 1.27.1-1 +Version: 1.27.3 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil Homepage: https://github.com/grpc/grpc Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 6c2199a53..efebdb0fa 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.27.1 - SHA512 00a5e1e0f94e441b3406f821943d1775a7ab0580fd22d604ba29f56dc424ccc8f27c476077e39f24ddd7f1bada4eba9a38456fb4ac546e27ae239f43e431d988 + REF v1.27.3 + SHA512 0338eedcce40cd7359cc1b216eb3eeaaeb1f2b065d1bb03e72322978a7e40ef8ecc1ad39808bec8c0fd5bcaa91e91bbd6037e5a6611a979c9ab413eb159bb38b HEAD_REF master PATCHES 00001-fix-uwp.patch diff --git a/ports/healpix/CONTROL b/ports/healpix/CONTROL new file mode 100644 index 000000000..f29051305 --- /dev/null +++ b/ports/healpix/CONTROL @@ -0,0 +1,6 @@ +Source: healpix +Version: 1.12.10 +Homepage: http://healpix.sourceforge.net/ +Description: HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere. +Build-Depends: cfitsio +Supports: linux
\ No newline at end of file diff --git a/ports/healpix/portfile.cmake b/ports/healpix/portfile.cmake new file mode 100644 index 000000000..5dbd9c3c2 --- /dev/null +++ b/ports/healpix/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_fail_port_install(ON_TARGET "Windows" "OSX") + +set(HEALPIX_VER 3.50) +set(HEALPIX_PACK_NAME ${HEALPIX_VER}_2018Dec10) + +vcpkg_download_distfile(ARCHIVE + URLS "https://phoenixnap.dl.sourceforge.net/project/healpix/Healpix_${HEALPIX_VER}/Healpix_${HEALPIX_PACK_NAME}.tar.gz" + FILENAME "Healpix_${HEALPIX_PACK_NAME}.tar.gz" + SHA512 29fe680d757bd94651bf029654257cb67286643aad510df4c2f0b06245174411376ec1beca64feebfac14a6fc0194525170635842916d79dcaddeddd9ac6f6c7 +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH src/cxx + AUTOCONFIG + NO_DEBUG + OPTIONS + --with-libcfitsio-include=${CURRENT_INSTALLED_DIR}/include/cfitsio + --with-libcfitsio-lib=${CURRENT_INSTALLED_DIR}/lib +) + +vcpkg_build_make() + +# Install manually +set(OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/src/cxx/auto) +file(GLOB_RECURSE HEALPIX_LIBS ${OBJ_DIR}/lib/*) +file(INSTALL ${HEALPIX_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + +file(GLOB_RECURSE HEALPIX_INCLUDES ${OBJ_DIR}/include/*) +file(INSTALL ${HEALPIX_INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(GLOB_RECURSE HEALPIX_TOOLS ${OBJ_DIR}/bin/*) +file(INSTALL ${HEALPIX_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL index 296efc1bf..f98540c70 100644 --- a/ports/hpx/CONTROL +++ b/ports/hpx/CONTROL @@ -1,5 +1,5 @@ Source: hpx
-Version: 1.4.0-1
+Version: 1.4.1
Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-bimap, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
Homepage: https://github.com/STEllAR-GROUP/hpx
Description: The C++ Standards Library for Concurrency and Parallelism
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 69f619f27..cabab3b8f 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.4.0 - SHA512 501dbea384f8daa725f752f78198ba8af7b41bf0da432655fb0eaf588ccb1cec40528e28c6dc898230090d04e3dd2c50f7cadd753a13d15b51cea0ac881c3ffd + REF 1.4.1 + SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582 HEAD_REF stable ) @@ -41,13 +41,14 @@ foreach(CMAKE_FILE IN LISTS CMAKE_FILES) file(WRITE ${CMAKE_FILE} "${_contents}") endforeach() -file(READ "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" _contents) -string(REPLACE "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \"\${CMAKE_CURRENT_LIST_DIR}/../../lib/cmake/HPX\")" "list(APPEND CMAKE_MODULE_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")" _contents "${_contents}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" "${_contents}") +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/${PORT}/HPXMacros.cmake" + "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \"\${CMAKE_CURRENT_LIST_DIR}\")" + "list(APPEND CMAKE_MODULE_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")") file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx RENAME copyright) + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll) if(DLLS) diff --git a/ports/hyperscan/CONTROL b/ports/hyperscan/CONTROL index ad761ba3a..a060054ac 100644 --- a/ports/hyperscan/CONTROL +++ b/ports/hyperscan/CONTROL @@ -1,4 +1,5 @@ Source: hyperscan
-Version: 5.1.0-3
+Version: 5.2.1
+Homepage: https://www.hyperscan.io
Description: A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.
-Build-Depends: boost-array, boost-chrono, boost-config, boost-core, boost-detail, boost-functional, boost-regex, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-utility, boost-dynamic-bitset, boost-random, boost-graph, boost-multi-array, boost-icl, boost-ptr-container, python3, ragel
+Build-Depends: boost-array, boost-chrono, boost-config, boost-core, boost-crc, boost-detail, boost-functional, boost-regex, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-utility, boost-dynamic-bitset, boost-random, boost-graph, boost-multi-array, boost-icl, boost-ptr-container, python3, ragel
diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake index f9778cb73..19144cca4 100644 --- a/ports/hyperscan/portfile.cmake +++ b/ports/hyperscan/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-set(HYPERSCAN_VERSION 5.1.0)
+set(HYPERSCAN_VERSION 5.2.1)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO intel/hyperscan
REF v${HYPERSCAN_VERSION}
- SHA512 5e6d11429e61dc061dd31e6b311a8c1dbfcd03af6e24d97b95eb2cef24dcd33d593064e5faa7c22807d785a8921bc410a69a43c4e5b3d7b4774f37c4a12a025d
+ SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c
HEAD_REF master
)
diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index cdbe80a39..3f41ad191 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,5 +1,5 @@ Source: icu
-Version: 65.1-1
+Version: 65.1-2
Homepage: http://icu-project.org/apiref/icu4c/
Description: Mature and widely used Unicode and localization library.
-Supports: !uwp
\ No newline at end of file +Supports: !uwp
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index ca205fbae..eb690fb13 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -32,7 +32,7 @@ else() set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --enable-static --disable-shared")
endif()
-set(CONFIGURE_OPTIONS_RELASE "--disable-debug --enable-release --prefix=${CURRENT_PACKAGES_DIR}")
+set(CONFIGURE_OPTIONS_RELEASE "--disable-debug --enable-release --prefix=${CURRENT_PACKAGES_DIR}")
set(CONFIGURE_OPTIONS_DEBUG "--enable-debug --disable-release --prefix=${CURRENT_PACKAGES_DIR}/debug")
if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@@ -48,7 +48,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor set(ENV{CXXFLAGS} "-O2 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}")
vcpkg_execute_required_process(
COMMAND ${BASH} --noprofile --norc -c
- "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELASE}"
+ "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
LOGNAME "configure-${TARGET_TRIPLET}-rel")
message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
@@ -101,7 +101,7 @@ else() set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF")
vcpkg_execute_required_process(
COMMAND ${BASH} --noprofile --norc -c
- "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELASE}"
+ "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
LOGNAME "configure-${TARGET_TRIPLET}-rel")
message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index 3eda8264a..e17d718d8 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -8,9 +8,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Irrlicht directories
# -------------------------------------------------------------------------------------------------
-set(IRR_ROOT_DIR "")
set(IRR_SRC_DIR "source/Irrlicht")
set(IRR_INC_DIR "include")
+set(IRR_TOOL_DIR "tools")
# Options
# -------------------------------------------------------------------------------------------------
@@ -19,6 +19,7 @@ if(DEFINED ENV{DXSDK_DIR}) set(DXSDK "ENV{DXSDK_DIR}")
endif()
+set(IRR_UNICODE_PATH 0 CACHE BOOL "Whether to enable unicode path support on windows")
set(IRR_FAST_MATH 0 CACHE BOOL "Whether to enable fast maths (at the expense of precision)")
set(IRR_SHARED_LIB 1 CACHE BOOL "Whether to generate shared libraries instead of static libraries")
set(IRR_DIRECTX_SDK ${DXSDK} CACHE PATH "Path to the DirectX SDK (for DirectX 9, this folder should contain /Include, /Lib)")
@@ -43,10 +44,10 @@ glob_c_cpp_sources(IRR_SRC_FILES_INTERFACE ${IRR_INC_DIR}) glob_c_cpp_sources(IRR_SRC_FILES_AESGLADMAN ${IRR_SRC_DIR}/aesGladman)
glob_c_cpp_sources(IRR_SRC_FILES_LZMA ${IRR_SRC_DIR}/lzma)
-glob_c_cpp_sources(IRR_TOOL_FILES_FILE_TO_HEADER ${IRR_ROOT_DIR}/tools/FileToHeader/)
-glob_c_cpp_sources(IRR_TOOL_FILES_GUI_EDITOR ${IRR_ROOT_DIR}/tools/GUIEditor/)
-glob_c_cpp_sources(IRR_TOOL_FILES_FONT_TOOL ${IRR_ROOT_DIR}/tools/IrrFontTool/newFontTool/)
-glob_c_cpp_sources(IRR_TOOL_FILES_MESH_CONVERTER ${IRR_ROOT_DIR}/tools/MeshConverter/)
+glob_c_cpp_sources(IRR_TOOL_FILES_FILE_TO_HEADER ${IRR_TOOL_DIR}/FileToHeader/)
+glob_c_cpp_sources(IRR_TOOL_FILES_GUI_EDITOR ${IRR_TOOL_DIR}/GUIEditor/)
+glob_c_cpp_sources(IRR_TOOL_FILES_FONT_TOOL ${IRR_TOOL_DIR}/IrrFontTool/newFontTool/)
+glob_c_cpp_sources(IRR_TOOL_FILES_MESH_CONVERTER ${IRR_TOOL_DIR}/MeshConverter/)
# Group files
# -------------------------------------------------------------------------------------------------
@@ -161,6 +162,12 @@ if(WIN32) # Multi processor compilation
target_compile_options(Irrlicht PRIVATE /MP)
+ # Unicode
+ if(${IRR_UNICODE_PATH})
+ target_compile_definitions(Irrlicht PRIVATE UNICODE _UNICODE)
+ target_compile_definitions(Irrlicht PUBLIC _IRR_WCHAR_FILESYSTEM)
+ endif()
+
# Fast math options
if(${IRR_FAST_MATH})
target_compile_options(Irrlicht PRIVATE /fp:fast)
diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index 155b2f38b..5870178c2 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -1,9 +1,12 @@ Source: irrlicht
-Version: 1.8.4-4
+Version: 1.8.4-5
Homepage: http://irrlicht.sourceforge.net
Description: Irrlicht lightning fast 3d engine
Build-Depends: zlib, libpng, bzip2, libjpeg-turbo
+Feature: unicode
+Description: Support unicode path on windows
+
Feature: fast-fpu
Description: Enable fast maths (at the expense of precision)
diff --git a/ports/irrlicht/fix-encoding.patch b/ports/irrlicht/fix-encoding.patch new file mode 100644 index 000000000..d01bfad51 --- /dev/null +++ b/ports/irrlicht/fix-encoding.patch @@ -0,0 +1,13 @@ +diff --git a/include/Keycodes.h b/include/Keycodes.h +index e56eca1..57ab312 100644 +--- a/include/Keycodes.h ++++ b/include/Keycodes.h +@@ -89,7 +89,7 @@ namespace irr + KEY_KEY_X = 0x58, // X key + KEY_KEY_Y = 0x59, // Y key + KEY_KEY_Z = 0x5A, // Z key +- KEY_LWIN = 0x5B, // Left Windows key (Microsoft® Natural® keyboard) ++ KEY_LWIN = 0x5B, // Left Windows key (Microsoft® Natural® keyboard) + KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard) + KEY_APPS = 0x5D, // Applications key (Natural keyboard) + KEY_SLEEP = 0x5F, // Computer Sleep key diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 09e42c954..f10e80422 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_download_distfile(ARCHIVE
URLS "https://downloads.sourceforge.net/project/irrlicht/Irrlicht%20SDK/1.8/1.8.4/irrlicht-1.8.4.zip"
FILENAME "irrlicht-1.8.4.zip"
@@ -10,24 +8,21 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF "1.8.4"
- # [NO_REMOVE_ONE_LEVEL]
- # [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>]
- # [PATCHES <a.patch>...]
+ PATCHES
+ "fix-encoding.patch"
)
# Copy CMakeLists.txt to the source, because Irrlicht does not have one.
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${SOURCE_PATH})
-set(FAST_MATH FALSE)
-if("fast-fpu" IN_LIST FEATURES)
- set(FAST_MATH TRUE)
-endif()
-
-set(BUILD_TOOLS FALSE)
-if("tools" IN_LIST FEATURES)
- set(BUILD_TOOLS TRUE)
-endif()
+vcpkg_check_features(
+ OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ FEATURES
+ unicode IRR_UNICODE_PATH
+ fast-fpu IRR_FAST_MATH
+ tools IRR_BUILD_TOOLS
+)
set(SHARED_LIB TRUE)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -38,18 +33,15 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
- -DIRR_SHARED_LIB=${SHARED_LIB}
- -DIRR_FAST_MATH=${FAST_MATH}
- -DIRR_BUILD_TOOLS=${BUILD_TOOLS}
- # OPTIONS_RELEASE -DOPTIMIZE=1
- # OPTIONS_DEBUG -DDEBUGGABLE=1
+ -DIRR_SHARED_LIB=${SHARED_LIB}
+ ${FEATURE_OPTIONS}
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
-if(BUILD_TOOLS)
+if("tools" IN_LIST FEATURES)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/)
endif()
diff --git a/ports/jsoncons/CONTROL b/ports/jsoncons/CONTROL index b10dfd737..4a932fcde 100644 --- a/ports/jsoncons/CONTROL +++ b/ports/jsoncons/CONTROL @@ -1,4 +1,4 @@ Source: jsoncons -Version: 0.144.0 +Version: 0.146.0 Description: A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSONPath, CSV, MessagePack, CBOR, BSON, UBJSON Homepage: https://github.com/danielaparker/jsoncons diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index e0ec7507e..5732261fe 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons - REF 7414d9f8165f5f69950d342be6db7afdcd7a692b # v0.144.0 - SHA512 846e8c1cf4d3ed1c2bc51d5a683743f84efddeba0d5badec95dfa3aa059ed94a5e07bdac5efe09a3c13291f0745c6e1d9e2d8a46d91d9947d559d3bbe69f6d97 + REF 91c275b5c6d2fdbcdfee5c66bd74e7072543bc99 # v0.146.0 + SHA512 8857060bed5ac32954386ad6447d30442c0882f6c0153b3cb12022fc1651b21eb62a14dc6198f45abe1a469784f9af6d3e9565a380b917d270e45103c4a9e265 HEAD_REF master ) diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL index b399126c1..2bc553cf5 100644 --- a/ports/kd-soap/CONTROL +++ b/ports/kd-soap/CONTROL @@ -1,5 +1,5 @@ Source: kd-soap
-Version: 1.8.0
+Version: 1.8.0-1
Description: A Qt-based client-side and server-side SOAP component
Homepage: https://www.kdab.com/products/kd-soap
Build-Depends: qt5-base
diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index 61102836c..d924d1c65 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDAB/KDSoap
@@ -19,8 +17,11 @@ vcpkg_install_cmake() # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/kd-soap RENAME copyright)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp.exe ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp.exe)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX})
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
diff --git a/ports/libcpuid/CONTROL b/ports/libcpuid/CONTROL new file mode 100644 index 000000000..a39e59e23 --- /dev/null +++ b/ports/libcpuid/CONTROL @@ -0,0 +1,5 @@ +Source: libcpuid +Version: 0.4.1 +Homepage: https://github.com/anrieff/libcpuid +Description: Provides CPU identification for the x86 (and x86_64) +Supports: x86 | x64 diff --git a/ports/libcpuid/portfile.cmake b/ports/libcpuid/portfile.cmake new file mode 100644 index 000000000..16d073951 --- /dev/null +++ b/ports/libcpuid/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO anrieff/libcpuid + REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0 + SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_DOCS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL index 0c320dd40..fbf739e77 100644 --- a/ports/libgit2/CONTROL +++ b/ports/libgit2/CONTROL @@ -1,5 +1,5 @@ Source: libgit2
-Version: 0.28.4
+Version: 0.99.0
Homepage: https://github.com/libgit2/libgit2
Build-Depends: openssl (!windows&&!uwp)
Description: Git linkable library
diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index b3b6f1d78..12566af64 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -1,15 +1,11 @@ # libgit2 uses winapi functions not available in WindowsStore
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
- message(FATAL_ERROR "Error: UWP builds are not supported.")
-endif()
-
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "uwp")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libgit2/libgit2
- REF v0.28.4
- SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
+ REF v0.99.0
+ SHA512 e38e18da0e6ed1e5c8198c9eb2c362b21da2d0b9c8bc23309d2f70183549f4b9f23a6db8ce5f1f0f24b373e6427039c2a845b62dd74f91b02cfe8954f961a91b
HEAD_REF master
)
@@ -27,5 +23,4 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgit2)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgit2/COPYING ${CURRENT_PACKAGES_DIR}/share/libgit2/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgit2 RENAME copyright)
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 2132fd8e0..6507c55c7 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,4 +1,4 @@ Source: libmariadb
-Version: 3.1.7 +Version: 3.1.7-1 Homepage: https://github.com/MariaDB/mariadb-connector-c
Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
diff --git a/ports/libmariadb/md.patch b/ports/libmariadb/md.patch index 42199cf92..dc92b6988 100644 --- a/ports/libmariadb/md.patch +++ b/ports/libmariadb/md.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef45ee8..470573e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,7 +110,7 @@ IF(NOT IS_SUBPROJECT)
- IF(MSVC)
- # Speedup system tests
- INCLUDE(${CC_SOURCE_DIR}/cmake/WindowsCache.cmake)
-- IF (MSVC)
-+ IF (MSVC AND 0)
- SET(CONFIG_TYPES "DEBUG" "RELEASE" "RELWITHDEBINFO")
- FOREACH(BUILD_TYPE ${CONFIG_TYPES})
- FOREACH(COMPILER CXX C)
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index 528c170..a5cd3fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ IF(MSVC) + # Speedup system tests + INCLUDE(${CC_SOURCE_DIR}/cmake/WindowsCache.cmake) + ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN) +- IF (MSVC) ++ IF (MSVC AND 0) + SET(CONFIG_TYPES "DEBUG" "RELEASE" "RELWITHDEBINFO") + FOREACH(BUILD_TYPE ${CONFIG_TYPES}) + FOREACH(COMPILER CXX C) diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL index 1195fecc2..f3791e9d5 100644 --- a/ports/libmysql/CONTROL +++ b/ports/libmysql/CONTROL @@ -1,5 +1,5 @@ Source: libmysql -Version: 8.0.4-5 +Version: 8.0.4-6 Homepage: https://github.com/mysql/mysql-server Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib Description: A MySQL client library for C development. diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index e179ca714..791a9c5db 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -1,21 +1,13 @@ +vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86") + if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.") endif() -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "libmysql cannot currently be cross-compiled for UWP") -endif() - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT CMAKE_SYSTEM_NAME OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "Oracle has dropped support in libmysql for 32-bit Windows.") -endif() - if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") message(WARNING "libmysql needs ncurses on LINUX, please install ncurses first.\nOn Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates it is ncurses-devel.") endif() -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mysql/mysql-server @@ -26,6 +18,7 @@ vcpkg_from_github( ignore-boost-version.patch system-libs.patch linux_libmysql.patch + re2_add_compile_flags.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_65_0) @@ -74,7 +67,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/docs ${CURRENT_PACKAGES_DIR}/debug/docs - ${CURRENT_PACKAGES_DIR}/lib/debug) + ${CURRENT_PACKAGES_DIR}/lib/debug + ${CURRENT_PACKAGES_DIR}/lib/plugin/debug) # remove misc files file(REMOVE @@ -120,5 +114,4 @@ string(REPLACE "#include <mysql/udf_registration_types.h>" "#include \"mysql/udf file(WRITE ${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h "${_contents}") # copy license -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmysql) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmysql/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libmysql/re2_add_compile_flags.patch b/ports/libmysql/re2_add_compile_flags.patch new file mode 100644 index 000000000..4734e84f6 --- /dev/null +++ b/ports/libmysql/re2_add_compile_flags.patch @@ -0,0 +1,12 @@ +diff --git a/extra/re2/CMakeLists.txt b/extra/re2/CMakeLists.txt +index ca39db726..965f2c8dc 100644 +--- a/extra/re2/CMakeLists.txt ++++ b/extra/re2/CMakeLists.txt +@@ -71,6 +71,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + HAVE_TAUTOLOGICAL_UNDEFINED_COMPARE) + IF(HAVE_TAUTOLOGICAL_UNDEFINED_COMPARE) + # Boost source has unused local typedefs. ++ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) + ADD_COMPILE_FLAGS(${RE2_SOURCES} + COMPILE_FLAGS "-Wno-tautological-undefined-compare") + ENDIF() diff --git a/ports/libraqm/CMakeLists.txt b/ports/libraqm/CMakeLists.txt index b1a88b268..22f4e59d9 100644 --- a/ports/libraqm/CMakeLists.txt +++ b/ports/libraqm/CMakeLists.txt @@ -13,10 +13,11 @@ find_path(HARFBUZZ_INCLUDE_DIRS PATH_SUFFIXES harfbuzz)
find_path(FREETYPE_ADDITIONAL_INCLUDE_DIRS NAMES ft2build.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h)
+configure_file(src/raqm-version.h.in src/raqm-version.h)
-add_library(raqm ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.c ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h)
+add_library(raqm src/raqm.c src/raqm.h src/raqm-version.h)
+target_include_directories(raqm PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src)
target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_ADDITIONAL_INCLUDE_DIRS})
target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_INCLUDE_DIRS})
target_include_directories(raqm SYSTEM PUBLIC ${HARFBUZZ_INCLUDE_DIRS})
@@ -34,4 +35,4 @@ install(TARGETS raqm set(RAQM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
set(RAQM_LIBRARY raqm)
set(RAQM_LIBRARIES ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY})
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_BINARY_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/libraqm/CONTROL b/ports/libraqm/CONTROL index f637fac3a..d768af76f 100644 --- a/ports/libraqm/CONTROL +++ b/ports/libraqm/CONTROL @@ -1,4 +1,4 @@ Source: libraqm
-Version: 0.7.0
+Version: 0.7.0-1
Description: A library for complex text layout
Build-Depends: freetype, harfbuzz, fribidi
\ No newline at end of file diff --git a/ports/libwebsockets/CMakeLists.patch b/ports/libwebsockets/CMakeLists.patch index c2263f709..035b69d66 100644 --- a/ports/libwebsockets/CMakeLists.patch +++ b/ports/libwebsockets/CMakeLists.patch @@ -1,8 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4daeec85e..34e5e197d 100644 ---- a/CMakeLists.txt +index 7772ed0..656e5a0 100644 +--- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1822,7 +1822,7 @@ endif() +@@ -1767,7 +1767,7 @@ endif(LWS_WITH_LIBEV) + if (LWS_WITH_LIBUV) + if (NOT LIBUV_FOUND) + find_path(LIBUV_INCLUDE_DIRS NAMES uv.h) +- find_library(LIBUV_LIBRARIES NAMES uv) ++ find_library(LIBUV_LIBRARIES NAMES uv libuv) + if(LIBUV_INCLUDE_DIRS AND LIBUV_LIBRARIES) + set(LIBUV_FOUND 1) + endif() +@@ -1826,7 +1826,7 @@ endif() if (WINCE) list(APPEND LIB_LIST ws2.lib) elseif (WIN32) diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL index e6f9a9cb8..77536b9f8 100644 --- a/ports/libwebsockets/CONTROL +++ b/ports/libwebsockets/CONTROL @@ -1,5 +1,5 @@ Source: libwebsockets -Version: 3.2.2 -Build-Depends: zlib, openssl +Version: 3.2.2-1 +Build-Depends: zlib, openssl, libuv Homepage: https://github.com/warmcat/libwebsockets Description: Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server. diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index fe979df59..a05ce4b16 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets @@ -141,6 +139,7 @@ vcpkg_configure_cmake( -DLWS_IPV6=ON -DLWS_HTTP2=ON -DLWS_WITH_HTTP_STREAM_COMPRESSION=ON # Since zlib is already a dependency + -DLWS_WITH_LIBUV=ON # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index 2eb184a84..2d30612b0 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,5 +1,5 @@ Source: llvm -Version: 8.0.0-3 +Version: 8.0.0-4 Homepage: https://llvm.org/ Description: The LLVM Compiler Infrastructure Build-Depends: atlmfc (windows) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 61f45654c..d8613f728 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -129,4 +129,4 @@ if(NOT MACHOFILES) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/luajit/002-fix-build-path.patch b/ports/luajit/001-fix-build-path.patch index b97bf689f..bd14d7089 100644 --- a/ports/luajit/002-fix-build-path.patch +++ b/ports/luajit/001-fix-build-path.patch @@ -1,124 +1,119 @@ -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index 6f64a49..ba77cd5 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -14,17 +14,18 @@ - @if not defined INCLUDE goto :FAIL - - @setlocal --@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline -+@set SOURCEDIR=%1 -+@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR% - @set LJLINK=link /nologo - @set LJMT=mt /nologo - @set LJLIB=lib /nologo /nodefaultlib --@set DASMDIR=..\dynasm -+@set DASMDIR=%SOURCEDIR%\..\dynasm - @set DASM=%DASMDIR%\dynasm.lua - @set LJDLLNAME=lua51.dll - @set LJLIBNAME=lua51.lib --@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c -+@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c - --%LJCOMPILE% host\minilua.c -+%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:minilua.exe minilua.obj - @if errorlevel 1 goto :BAD -@@ -38,10 +39,10 @@ if exist minilua.exe.manifest^ - @set DASMFLAGS=-D WIN -D JIT -D FFI - @set LJARCH=x86 - :X64 --minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc -+minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %SOURCEDIR%\vm_x86.dasc - @if errorlevel 1 goto :BAD - --%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c -+%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:buildvm.exe buildvm*.obj - @if errorlevel 1 goto :BAD -@@ -50,30 +51,30 @@ if exist buildvm.exe.manifest^ - - buildvm -m peobj -o lj_vm.obj - @if errorlevel 1 goto :BAD --buildvm -m bcdef -o lj_bcdef.h %ALL_LIB% -+buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m ffdef -o lj_ffdef.h %ALL_LIB% -+buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m libdef -o lj_libdef.h %ALL_LIB% -+buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m recdef -o lj_recdef.h %ALL_LIB% -+buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB% -+buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m folddef -o lj_folddef.h lj_opt_fold.c -+buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c - @if errorlevel 1 goto :BAD - --@if "%1" neq "debug" goto :NODEBUG -+@set LJLINK=%LJLINK% /debug -+@if "%2" neq "debug" goto :NODEBUG - @shift - @set LJCOMPILE=%LJCOMPILE% /Zi --@set LJLINK=%LJLINK% /debug - @set DEBUG=1 - :NODEBUG --@if "%1"=="amalg" goto :AMALGDLL --@if "%1"=="static" goto :STATIC -+@if "%2"=="amalg" goto :AMALGDLL -+@if "%2"=="static" goto :STATIC - @if "%DEBUG%"=="1" set LJCOMPILE=%LJCOMPILE% /MDd - @if "%DEBUG%"=="" set LJCOMPILE=%LJCOMPILE% /MD --%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c -+%LJCOMPILE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD -@@ -81,13 +82,13 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c - :STATIC - @if "%DEBUG%"=="1" set LJCOMPILE=%LJCOMPILE% /MTd - @if "%DEBUG%"=="" set LJCOMPILE=%LJCOMPILE% /MT --%LJCOMPILE% lj_*.c lib_*.c -+%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb - @if errorlevel 1 goto :BAD - %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD - @goto :MTDLL - :AMALGDLL --%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c -+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c - @if errorlevel 1 goto :BAD - %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj - @if errorlevel 1 goto :BAD -@@ -95,7 +96,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c - if exist %LJDLLNAME%.manifest^ - %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 - --%LJCOMPILE% luajit.c -+%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% - @if errorlevel 1 goto :BAD -@@ -103,8 +104,8 @@ if exist luajit.exe.manifest^ - %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe - - @del *.obj *.manifest minilua.exe buildvm.exe --@del host\buildvm_arch.h --@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h -+@del %SOURCEDIR%\host\buildvm_arch.h -+@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h - @echo. - @echo === Successfully built LuaJIT for Windows/%LJARCH% === - -@@ -117,4 +118,5 @@ if exist luajit.exe.manifest^ - @goto :END - :FAIL - @echo You must open a "Visual Studio .NET Command Prompt" to run this script -+exit 1 - :END +diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
+index 42e3652..6a889e1 100644
+--- a/src/msvcbuild.bat
++++ b/src/msvcbuild.bat
+@@ -14,17 +14,18 @@
+ @if not defined INCLUDE goto :FAIL
+
+ @setlocal
+-@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
++@set SOURCEDIR=%1
++@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR%
+ @set LJLINK=link /nologo
+ @set LJMT=mt /nologo
+ @set LJLIB=lib /nologo /nodefaultlib
+-@set DASMDIR=..\dynasm
++@set DASMDIR=%SOURCEDIR%\..\dynasm
+ @set DASM=%DASMDIR%\dynasm.lua
+ @set LJDLLNAME=lua51.dll
+ @set LJLIBNAME=lua51.lib
+-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
++@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c
+
+-%LJCOMPILE% host\minilua.c
++%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /out:minilua.exe minilua.obj
+ @if errorlevel 1 goto :BAD
+@@ -38,10 +39,10 @@ if exist minilua.exe.manifest^
+ @set DASMFLAGS=-D WIN -D JIT -D FFI
+ @set LJARCH=x86
+ :X64
+-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc
++minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %SOURCEDIR%\vm_x86.dasc
+ @if errorlevel 1 goto :BAD
+
+-%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
++%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /out:buildvm.exe buildvm*.obj
+ @if errorlevel 1 goto :BAD
+@@ -50,39 +51,39 @@ if exist buildvm.exe.manifest^
+
+ buildvm -m peobj -o lj_vm.obj
+ @if errorlevel 1 goto :BAD
+-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
++buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
++buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
++buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
++buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
++buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB%
+ @if errorlevel 1 goto :BAD
+-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
++buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c
+ @if errorlevel 1 goto :BAD
+
+-@if "%1" neq "debug" goto :NODEBUG
++@set LJLINK=%LJLINK% /debug
++@if "%2" neq "debug" goto :NODEBUG
+ @shift
+ @set LJCOMPILE=%LJCOMPILE% /Zi
+-@set LJLINK=%LJLINK% /debug
+ :NODEBUG
+-@if "%1"=="amalg" goto :AMALGDLL
+-@if "%1"=="static" goto :STATIC
+-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
++@if "%2"=="amalg" goto :AMALGDLL
++@if "%2"=="static" goto :STATIC
++%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
+ @if errorlevel 1 goto :BAD
+ @goto :MTDLL
+ :STATIC
+-%LJCOMPILE% lj_*.c lib_*.c
++%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
+ @if errorlevel 1 goto :BAD
+ @goto :MTDLL
+ :AMALGDLL
+-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
++%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
+ @if errorlevel 1 goto :BAD
+@@ -90,7 +91,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ if exist %LJDLLNAME%.manifest^
+ %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
+
+-%LJCOMPILE% luajit.c
++%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
+ @if errorlevel 1 goto :BAD
+@@ -98,8 +99,8 @@ if exist luajit.exe.manifest^
+ %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
+
+ @del *.obj *.manifest minilua.exe buildvm.exe
+-@del host\buildvm_arch.h
+-@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
++@del %SOURCEDIR%\host\buildvm_arch.h
++@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h
+ @echo.
+ @echo === Successfully built LuaJIT for Windows/%LJARCH% ===
+
+@@ -112,4 +113,5 @@ if exist luajit.exe.manifest^
+ @goto :END
+ :FAIL
+ @echo You must open a "Visual Studio .NET Command Prompt" to run this script
++exit 1
+ :END
diff --git a/ports/luajit/001-fixStaticBuild.patch b/ports/luajit/001-fixStaticBuild.patch deleted file mode 100644 index b21991702..000000000 --- a/ports/luajit/001-fixStaticBuild.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index bd0c4c5..95e1cf4 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -67,15 +67,20 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c - @shift - @set LJCOMPILE=%LJCOMPILE% /Zi - @set LJLINK=%LJLINK% /debug -+@set DEBUG=1 - :NODEBUG - @if "%1"=="amalg" goto :AMALGDLL - @if "%1"=="static" goto :STATIC --%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c -+@if "%DEBUG%"=="1" set LJCOMPILE=%LJCOMPILE% /MDd -+@if "%DEBUG%"=="" set LJCOMPILE=%LJCOMPILE% /MD -+%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c - @if errorlevel 1 goto :BAD - %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD - @goto :MTDLL - :STATIC -+@if "%DEBUG%"=="1" set LJCOMPILE=%LJCOMPILE% /MTd -+@if "%DEBUG%"=="" set LJCOMPILE=%LJCOMPILE% /MT - %LJCOMPILE% lj_*.c lib_*.c - @if errorlevel 1 goto :BAD - %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj diff --git a/ports/luajit/002-fix-crt-linkage.patch b/ports/luajit/002-fix-crt-linkage.patch new file mode 100644 index 000000000..cbc273efc --- /dev/null +++ b/ports/luajit/002-fix-crt-linkage.patch @@ -0,0 +1,42 @@ +diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
+index 6a889e1..08c4e3c 100644
+--- a/src/msvcbuild.bat
++++ b/src/msvcbuild.bat
+@@ -64,20 +64,23 @@ buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB%
+ buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c
+ @if errorlevel 1 goto :BAD
+
++@if "%2"=="static" set CRT_LINKAGE=/MT
++@if "%2"=="dynamic" set CRT_LINKAGE=/MD
+ @set LJLINK=%LJLINK% /debug
+-@if "%2" neq "debug" goto :NODEBUG
++@if "%3" neq "debug" goto :NODEBUG
+ @shift
+ @set LJCOMPILE=%LJCOMPILE% /Zi
++@set CRT_LINKAGE=%CRT_LINKAGE%d
+ :NODEBUG
+-@if "%2"=="amalg" goto :AMALGDLL
++@if "%3"=="amalg" goto :AMALGDLL
+-@if "%2"=="static" goto :STATIC
++@if "%3"=="static" goto :STATIC
+-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
++%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
+ @if errorlevel 1 goto :BAD
+ @goto :MTDLL
+ :STATIC
+-%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
++%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
+ @if errorlevel 1 goto :BAD
+@@ -94,7 +94,7 @@
+ if exist %LJDLLNAME%.manifest^
+ %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
+
+-%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb
++%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\luajit.c /Fdluajit.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
+ @if errorlevel 1 goto :BAD
diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index 09b634c16..262f7ec09 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_from_github( SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576
HEAD_REF master
PATCHES
- 001-fixStaticBuild.patch
- 002-fix-build-path.patch
+ 001-fix-build-path.patch
+ 002-fix-crt-linkage.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -24,7 +24,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) vcpkg_execute_required_process_repeat(
COUNT 1
- COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src debug ${LJIT_STATIC}
+ COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
LOGNAME build-${TARGET_TRIPLET}-dbg
)
@@ -47,7 +47,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) vcpkg_execute_required_process_repeat(d8un
COUNT 1
- COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${LJIT_STATIC}
+ COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
LOGNAME build-${TARGET_TRIPLET}-rel
)
diff --git a/ports/murmurhash/CMakeLists.txt b/ports/murmurhash/CMakeLists.txt new file mode 100644 index 000000000..681f9592c --- /dev/null +++ b/ports/murmurhash/CMakeLists.txt @@ -0,0 +1,61 @@ +cmake_minimum_required(VERSION 3.14) + +set(VERSION "1.0.0") +project(murmurhash LANGUAGES CXX VERSION ${VERSION}) + +set(CMAKE_CXX_STANDARD 17) + +add_library(murmurhash + src/MurmurHash2.cpp + src/MurmurHash3.cpp + ) +target_include_directories(murmurhash SYSTEM PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/src) + +set(MURMUR_HEADERS + src/MurmurHash2.h + src/MurmurHash3.h + ) +set_target_properties(murmurhash PROPERTIES + PUBLIC_HEADER "${MURMUR_HEADERS}" + ) + +#Configuration +set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") +set(config_install_dir "lib/cmake/${PROJECT_NAME}") +set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") +set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") +set(namespace "${PROJECT_NAME}::") + +include(CMakePackageConfigHelpers) + +# Configure '<PROJECT-NAME>ConfigVersion.cmake' +# Use: +# * PROJECT_VERSION +write_basic_package_version_file( + "${version_config}" COMPATIBILITY SameMajorVersion +) + +# Configure '<PROJECT-NAME>Config.cmake' +# Use variables: +# * TARGETS_EXPORT_NAME +# * PROJECT_NAME +configure_package_config_file( + "${CMAKE_SOURCE_DIR}/Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION "${config_install_dir}" +) +#Installation +install(TARGETS murmurhash + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + INCLUDES DESTINATION "include") + +install(FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}" + ) +install(EXPORT "${TARGETS_EXPORT_NAME}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}" + )
\ No newline at end of file diff --git a/ports/murmurhash/CONTROL b/ports/murmurhash/CONTROL new file mode 100644 index 000000000..9c12b4a76 --- /dev/null +++ b/ports/murmurhash/CONTROL @@ -0,0 +1,4 @@ +Source: murmurhash +Version: 2016-01-09 +Homepage: https://github.com/aappleby/smhasher +Description: MurmurHash a family of hash functions. diff --git a/ports/murmurhash/Config.cmake.in b/ports/murmurhash/Config.cmake.in new file mode 100644 index 000000000..38bbde7b3 --- /dev/null +++ b/ports/murmurhash/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/ports/murmurhash/portfile.cmake b/ports/murmurhash/portfile.cmake new file mode 100644 index 000000000..83e1fd1fa --- /dev/null +++ b/ports/murmurhash/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aappleby/smhasher + REF 61a0530f28277f2e850bfc39600ce61d02b518de + SHA512 36877b53386153c20421ccd32d544c28ee72f6f13ea37c14ab1a1db378f6463db28339b2149671c12611384497bf595b798e99c34ea0ebceb6f9ef2f8908a2b6 + HEAD_REF master +) + +configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +configure_file(${CURRENT_PORT_DIR}/Config.cmake.in ${SOURCE_PATH}/Config.cmake.in COPYONLY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "MurmurHash3 was written by Austin Appleby, and is placed in the public domain. The author hereby disclaims copyright to this source code.") diff --git a/ports/nuspell/CONTROL b/ports/nuspell/CONTROL new file mode 100644 index 000000000..011370649 --- /dev/null +++ b/ports/nuspell/CONTROL @@ -0,0 +1,7 @@ +Source: nuspell +Version: 3.0.0 +Description: Nuspell is a free and open source spell checker library and + command-line program designed for languages with rich morphology and complex + word compounding. +Homepage: https://nuspell.github.io/ +Build-Depends: icu, boost-locale, boost-container, boost-range diff --git a/ports/nuspell/cmake-disable-cli-and-docs.patch b/ports/nuspell/cmake-disable-cli-and-docs.patch new file mode 100644 index 000000000..8b2caa51c --- /dev/null +++ b/ports/nuspell/cmake-disable-cli-and-docs.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6ca0212..8c14d24 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,8 +18,6 @@ if (subproject) + return() + endif() + +-add_subdirectory(docs) +- + option(BUILD_TESTING "Build the testing tree." ON) + if (BUILD_TESTING) + enable_testing() +diff --git a/src/nuspell/CMakeLists.txt b/src/nuspell/CMakeLists.txt +index 22894f6..d58ad43 100644 +--- a/src/nuspell/CMakeLists.txt ++++ b/src/nuspell/CMakeLists.txt +@@ -23,13 +23,6 @@ target_include_directories(nuspell + target_link_libraries(nuspell + PUBLIC Boost::boost ICU::uc ICU::data) + +-add_executable(nuspell-bin main.cxx) +-set_target_properties(nuspell-bin PROPERTIES +- OUTPUT_NAME nuspell) +-target_compile_definitions(nuspell-bin PRIVATE +- PROJECT_VERSION=\"${PROJECT_VERSION}\") +-target_link_libraries(nuspell-bin nuspell Boost::locale) +- + if (NOT subproject) + install(TARGETS nuspell + EXPORT NuspellTargets +@@ -40,5 +33,4 @@ if (NOT subproject) + install(EXPORT NuspellTargets + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/nuspell + NAMESPACE Nuspell::) +- install(TARGETS nuspell-bin DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() diff --git a/ports/nuspell/portfile.cmake b/ports/nuspell/portfile.cmake new file mode 100644 index 000000000..b0645864c --- /dev/null +++ b/ports/nuspell/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nuspell/nuspell + REF v3.0.0 + SHA512 d9cd7dd276e2bca43dec3abaf11c5206695949b9fda8c9b86f2772cc7e8fa95bf17c685a2ef9ca87fe3c4f0b55f2fcb435bc21c187355f5e3fa35dcafab2c8c2 + HEAD_REF master + + PATCHES cmake-disable-cli-and-docs.patch + # This patch disables building the CLI tool and leaves only the library. + # That is because Vcpkg complains when it finds .exe files in the folder + # "bin". Instead it expects them under "tools", which is different + # convention than on Unixes. This patch is quick fix, the CLI is not + # that important. +) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_TESTING=OFF +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nuspell) +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/lib/pkgconfig + ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +file( + INSTALL ${SOURCE_PATH}/COPYING.LESSER + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index 5769e4f8b..cba75db9a 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,5 +1,5 @@ Source: openal-soft -Version: 1.20.1 +Version: 1.20.1-1 Homepage: https://github.com/kcat/openal-soft Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. -Supports: !uwp
\ No newline at end of file +Supports: !uwp diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index dd65b35dd..251123d8e 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -17,14 +17,18 @@ else() set(OPENAL_LIBTYPE "STATIC") endif() +set(ALSOFT_REQUIRE_LINUX OFF) +set(ALSOFT_REQUIRE_WINDOWS OFF) +set(ALSOFT_REQUIRE_OSX OFF) + if(VCPKG_TARGET_IS_LINUX) - set(ALSOFT_REQUIRE_WINDOWS OFF) set(ALSOFT_REQUIRE_LINUX ON) endif() - if(VCPKG_TARGET_IS_WINDOWS) set(ALSOFT_REQUIRE_WINDOWS ON) - set(ALSOFT_REQUIRE_LINUX OFF) +endif() +if(VCPKG_TARGET_IS_OSX) + set(ALSOFT_REQUIRE_OSX ON) endif() vcpkg_configure_cmake( @@ -45,7 +49,7 @@ vcpkg_configure_cmake( -DALSOFT_BACKEND_QSA=OFF -DALSOFT_BACKEND_PORTAUDIO=OFF -DALSOFT_BACKEND_PULSEAUDIO=OFF - -DALSOFT_BACKEND_COREAUDIO=OFF + -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_OSX} -DALSOFT_BACKEND_JACK=OFF -DALSOFT_BACKEND_OPENSL=OFF -DALSOFT_BACKEND_WAVE=ON diff --git a/ports/opencensus-cpp/CONTROL b/ports/opencensus-cpp/CONTROL index 1a95985ad..bb0e4e0e6 100644 --- a/ports/opencensus-cpp/CONTROL +++ b/ports/opencensus-cpp/CONTROL @@ -1,8 +1,9 @@ Source: opencensus-cpp
-Version: 0.4.0
+Version: 0.4.0-1
Homepage: https://github.com/census-instrumentation/opencensus-cpp
Description: OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.
Build-Depends: abseil
+Supports: !windows
Feature: test
Description: Build test
\ No newline at end of file diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL index 7f883548d..dd7dc1e9b 100644 --- a/ports/openmvg/CONTROL +++ b/ports/openmvg/CONTROL @@ -1,5 +1,5 @@ Source: openmvg -Version: 1.4-7 +Version: 1.5 Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib, suitesparse diff --git a/ports/openmvg/fixcmake.patch b/ports/openmvg/fixcmake.patch index 2dd5201ec..fc84774c4 100644 --- a/ports/openmvg/fixcmake.patch +++ b/ports/openmvg/fixcmake.patch @@ -1,427 +1,421 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 654bebd..ab7dd90 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -17,27 +17,16 @@ endif() - # ============================================================================== - # OpenMVG build options - # ============================================================================== --option(OpenMVG_BUILD_SHARED "Build OpenMVG shared libs" OFF) --option(OpenMVG_BUILD_TESTS "Build OpenMVG tests" OFF) --option(OpenMVG_BUILD_DOC "Build OpenMVG documentation" ON) --option(OpenMVG_BUILD_EXAMPLES "Build OpenMVG samples applications." ON) --option(OpenMVG_BUILD_OPENGL_EXAMPLES "Build OpenMVG openGL examples" OFF) --option(OpenMVG_BUILD_SOFTWARES "Build OpenMVG softwares" ON) --option(OpenMVG_BUILD_GUI_SOFTWARES "Build OpenMVG GUI softwares (QT5)" ON) --option(OpenMVG_BUILD_COVERAGE "Enable code coverage generation (gcc only)" OFF) --option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON) - # ============================================================================== - # Opencv is not used by openMVG but some samples show how to use openCV - # and openMVG simultaneously - # ============================================================================== --option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF) - - # ============================================================================== - # Since OpenCV 3, SIFT is no longer in the default modules. See - # https://github.com/itseez/opencv_contrib for more informations. - # Enable this to be able to use OpenCV SIFT in main_ComputeFeatures_OpenCV. - # ============================================================================== --option(OpenMVG_USE_OCVSIFT "Add or not OpenCV SIFT in available features" OFF) - - # ============================================================================== - # OpenMVG version -@@ -85,15 +74,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - register_definitions(-DOPENMVG_STD_UNORDERED_MAP) - endif() - --# ============================================================================== --# Check that submodule have been initialized and updated --# ============================================================================== --if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include) -- message(FATAL_ERROR -- "\n submodule(s) are missing, please update your repository:\n" -- " > git submodule update -i\n") --endif() -- - # ============================================================================== - # Additional cmake find modules - # ============================================================================== -@@ -129,7 +109,6 @@ if (OpenMVG_USE_OPENMP) - find_package(OpenMP) - if (OPENMP_FOUND) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" ON) - register_definitions(-DOPENMVG_USE_OPENMP) - if (NOT MSVC) - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -@@ -140,11 +119,6 @@ if (OpenMVG_USE_OPENMP) - endif() - endif (NOT MSVC) - endif (OPENMP_FOUND) --else (OpenMVG_USE_OPENMP) -- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" OFF) -- include(UpdateCacheVariable) -- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENMP OFF) -- remove_definitions(-DOPENMVG_USE_OPENMP) - endif (OpenMVG_USE_OPENMP) - - # ============================================================================== -@@ -183,14 +157,6 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES) - set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw) - endif (OpenMVG_BUILD_OPENGL_EXAMPLES) - --# Dependencies install rules --install( -- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ -- DESTINATION include/openMVG_dependencies -- COMPONENT headers -- FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" --) -- - # ============================================================================== - # --END-- SUBMODULE CONFIGURATION - # ============================================================================== -@@ -226,14 +192,8 @@ ENDMACRO(UNIT_TEST) - # - external by default - # - internal if cereal not found - # ============================================================================== --find_package(cereal QUIET CONFIG) --if (NOT cereal_FOUND) -- set(CEREAL_INCLUDE_DIRS -- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/cereal/include) -- set(OpenMVG_USE_INTERNAL_CEREAL ON) --else() -- get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES) --endif() -+find_package(cereal REQUIRED CONFIG) -+get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES) - - # ============================================================================== - # Eigen -@@ -242,14 +202,8 @@ endif() - # - external if EIGEN_INCLUDE_DIR_HINTS is defined - # - internal if Eigen not found - # ============================================================================== --find_package(eigen3 QUIET) --if (NOT eigen3_FOUND) -- set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen) -- set(OpenMVG_USE_INTERNAL_EIGEN ON) -- find_package(Eigen QUIET) --else() -- set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) --endif() -+find_package(Eigen3 REQUIRED) -+set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) - - # ============================================================================== - # Ceres -@@ -257,17 +211,7 @@ endif() - # - external by default if CERES_DIR_HINTS or find_package found a valid Ceres - # - internal if ceres not found (ceres-solver+cxsparse+miniglog) - # ============================================================================== --find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS}) --if (NOT Ceres_FOUND) -- set(OpenMVG_USE_INTERNAL_CERES ON) -- set(CERES_INCLUDE_DIRS -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/include -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/internal/ceres/miniglog -- ${PROJECT_BINARY_DIR}/third_party/ceres-solver/config) -- FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/VERSION" CERES_CONFIG) -- STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG}) -- set(CERES_LIBRARIES openMVG_ceres) --endif() -+find_package(Ceres REQUIRED) - - # ============================================================================== - # Flann -@@ -275,14 +219,7 @@ endif() - # - internal by default (flann), - # - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found - # ============================================================================== --if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS) -- set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp) -- set(OpenMVG_USE_INTERNAL_FLANN ON) --endif() --find_package(Flann QUIET) --if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN) -- set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp) --endif() -+find_package(flann REQUIRED) - - # ============================================================================== - # CoinUtils -@@ -290,15 +227,7 @@ endif() - # - internal by default (CoinUtils), - # - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found - # ============================================================================== --if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS) -- set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/) -- set(OpenMVG_USE_INTERNAL_COINUTILS ON) --endif() --find_package(CoinUtils QUIET) --if (NOT COINUTILS_FOUND OR OpenMVG_USE_INTERNAL_COINUTILS) -- set(COINUTILS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/) -- set(COINUTILS_LIBRARY lib_CoinUtils) --endif() -+find_package(CoinUtils REQUIRED) - - ## ============================================================================== - ## Clp -@@ -306,17 +235,7 @@ endif() - ## - internal by default (Clp), - ## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found - ## ============================================================================== --if (NOT DEFINED CLP_INCLUDE_DIR_HINTS) -- set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/) -- set(OpenMVG_USE_INTERNAL_CLP ON) --endif() --find_package(Clp QUIET) --if (NOT CLP_FOUND OR OpenMVG_USE_INTERNAL_CLP) -- set(CLP_INCLUDE_DIRS -- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/ -- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/OsiClp/) -- set(CLP_LIBRARIES lib_clp lib_OsiClpSolver) --endif() -+find_package(Clp REQUIRED) - - # ============================================================================== - # Osi -@@ -324,15 +243,7 @@ endif() - # - internal by default (Osi), - # - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found - # ============================================================================== --if (NOT DEFINED OSI_INCLUDE_DIR_HINTS) -- set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/) -- set(OpenMVG_USE_INTERNAL_OSI ON) --endif() --find_package(Osi QUIET) --if (NOT OSI_FOUND OR OpenMVG_USE_INTERNAL_OSI) -- set(OSI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/Osi/) -- set(OSI_LIBRARY lib_Osi) --endif() -+find_package(Osi REQUIRED) - - # ============================================================================== - # Internal CLP/OSI/COINUTILS libraries: -@@ -351,17 +262,7 @@ endif() - # - internal by default (Lemon), - # - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found - # ============================================================================== --if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS) -- set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon) -- set(OpenMVG_USE_INTERNAL_LEMON ON) --endif() --find_package(Lemon QUIET) --if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON) -- set(LEMON_INCLUDE_DIRS -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon -- ${PROJECT_BINARY_DIR}/third_party/lemon) -- set(LEMON_LIBRARY openMVG_lemon) --endif() -+find_package(LEMON REQUIRED) - - # ============================================================================== - # OpenCV -@@ -369,14 +270,13 @@ endif() - # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON - # ============================================================================== - if (OpenMVG_USE_OPENCV) -- find_package( OpenCV QUIET ) -- if (NOT OpenCV_FOUND OR OpenCV_VERSION VERSION_LESS "3.0.0") -- message(STATUS "OpenCV was not found (note that OpenCV version >= 3.0.0 is required). -> Disabling OpenCV support.") -- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF) -- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF) -- endif() -+ find_package( OpenCV REQUIRED ) - endif() - -+# ============================================================================== -+# Suitesparse -+# ============================================================================== -+find_package(suitesparse REQUIRED) - - # ============================================================================== - # Third-party libraries: -@@ -469,67 +369,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT}) - - message("\n") - --if (DEFINED OpenMVG_USE_INTERNAL_CEREAL) -+if (OpenMVG_USE_INTERNAL_CEREAL) - message(STATUS "CEREAL: (internal)") - else() - message(STATUS "CEREAL: (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_EIGEN) -+if (OpenMVG_USE_INTERNAL_EIGEN) - message(STATUS "EIGEN: " ${EIGEN_VERSION} " (internal)") - else() - message(STATUS "EIGEN: " ${EIGEN_VERSION} " (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_CERES) -+if (OpenMVG_USE_INTERNAL_CERES) - message(STATUS "CERES: " ${CERES_VERSION} " (internal)") - else() - message(STATUS "CERES: " ${CERES_VERSION} " (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_FLANN) -+if (OpenMVG_USE_INTERNAL_FLANN) - message(STATUS "FLANN: " ${FLANN_VERSION} " (internal)") - else() - message(STATUS "FLANN: " ${FLANN_VERSION} " (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_TIFF) -+if (OpenMVG_USE_INTERNAL_TIFF) - message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (internal)") - else() - message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_PNG) -+if (OpenMVG_USE_INTERNAL_PNG) - message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (internal)") - else() - message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_JPEG) -+if (OpenMVG_USE_INTERNAL_JPEG) - message(STATUS "LIBJPEG (internal)") - else() - message(STATUS "LIBJPEG (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_CLP) -+if (OpenMVG_USE_INTERNAL_CLP) - message(STATUS "CLP: " ${CLP_VERSION} " (internal)") - else() - message(STATUS "CLP: " ${CLP_VERSION} " (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_COINUTILS) -+if (OpenMVG_USE_INTERNAL_COINUTILS) - message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (internal)") - else() - message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_OSI) -+if (OpenMVG_USE_INTERNAL_OSI) - message(STATUS "OSI: " ${OSI_VERSION} " (internal)") - else() - message(STATUS "OSI: " ${OSI_VERSION} " (external)") - endif() - --if (DEFINED OpenMVG_USE_INTERNAL_LEMON) -+if (OpenMVG_USE_INTERNAL_LEMON) - message(STATUS "LEMON: " ${LEMON_VERSION} " (internal)") - else() - message(STATUS "LEMON: " ${LEMON_VERSION} " (external)") -diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake -index c997b87..74c3aae 100644 ---- a/src/cmakeFindModules/FindClp.cmake -+++ b/src/cmakeFindModules/FindClp.cmake -@@ -51,8 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "") - SET(CLP_INCLUDE_DIR ${CLP_DIR}) - - FIND_LIBRARY(CLP_LIBRARY NAMES Clp) -- FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver) -- FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp) -+ FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp) -+ FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp) - - # locate Clp libraries - IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY) -diff --git a/src/openMVG/linearProgramming/CMakeLists.txt b/src/openMVG/linearProgramming/CMakeLists.txt -index cc5212f..acc57dd 100644 ---- a/src/openMVG/linearProgramming/CMakeLists.txt -+++ b/src/openMVG/linearProgramming/CMakeLists.txt -@@ -15,16 +15,12 @@ target_link_libraries(openMVG_linearProgramming - PUBLIC - openMVG_numeric - PRIVATE -- ${CLP_LIBRARIES} # clp + solver wrapper -- ${COINUTILS_LIBRARY} # container tools -- ${OSI_LIBRARY} # generic LP -+ Coin::Clp # clp + solver wrapper -+ Coin::CoinUtils # container tools -+ Coin::Osi # generic LP - ) - - target_include_directories(openMVG_linearProgramming -- PRIVATE -- ${CLP_INCLUDE_DIRS} -- ${COINUTILS_INCLUDE_DIRS} -- ${OSI_INCLUDE_DIRS} - PUBLIC - $<INSTALL_INTERFACE:include> - ) -diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt -index 80b1fe6..a091b47 100644 ---- a/src/openMVG/matching/CMakeLists.txt -+++ b/src/openMVG/matching/CMakeLists.txt -@@ -18,6 +18,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST}) - - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) -+find_package(flann REQUIRED) - - set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX) - add_library(openMVG_matching -@@ -38,10 +39,10 @@ target_link_libraries(openMVG_matching - openMVG_features - Threads::Threads - ) --if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN) -+if (NOT OpenMVG_USE_INTERNAL_FLANN) - target_link_libraries(openMVG_matching - PUBLIC -- ${FLANN_LIBRARIES} -+ flann::flann - ) - endif() - set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") -diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt -index 816a941..f0b7145 100644 ---- a/src/third_party/CMakeLists.txt -+++ b/src/third_party/CMakeLists.txt -@@ -18,7 +18,7 @@ add_subdirectory(stlplus3) - set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE) - - # Add graph library --if(DEFINED OpenMVG_USE_INTERNAL_LEMON) -+if(OpenMVG_USE_INTERNAL_LEMON) - add_subdirectory(lemon) - set_property(TARGET openMVG_lemon PROPERTY FOLDER OpenMVG/3rdParty/lemon) - set_property(TARGET check PROPERTY FOLDER OpenMVG/3rdParty/lemon) -@@ -68,7 +68,7 @@ endif (NOT TIFF_FOUND) - add_subdirectory(vectorGraphics) - - # Add ceres-solver (A Nonlinear Least Squares Minimizer) --if (DEFINED OpenMVG_USE_INTERNAL_CERES) -+if (OpenMVG_USE_INTERNAL_CERES) - add_subdirectory(cxsparse) - add_subdirectory(ceres-solver) - set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres) -@@ -76,7 +76,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES) - endif() - - # Add an Approximate Nearest Neighbor library --if (DEFINED OpenMVG_USE_INTERNAL_FLANN) -+if (OpenMVG_USE_INTERNAL_FLANN) - set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp) - add_subdirectory(flann) - endif() -@@ -90,7 +90,7 @@ add_subdirectory(fast) - ## - # Install Header only libraries if necessary - ## --if (DEFINED OpenMVG_USE_INTERNAL_EIGEN) -+if (OpenMVG_USE_INTERNAL_EIGEN) - #Configure Eigen install - set(EIGEN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen) - add_subdirectory(eigen) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9cfd06c..a4dea06 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -14,6 +14,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+ message(FATAL_ERROR "In-source builds not allowed.")
+ endif()
+
++if(0)
+ # ==============================================================================
+ # OpenMVG build options
+ # ==============================================================================
+@@ -31,7 +32,7 @@ option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON)
+ # and openMVG simultaneously
+ # ==============================================================================
+ option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF)
+-
++endif()
+ # ==============================================================================
+ # Since OpenCV 3, SIFT is no longer in the default modules. See
+ # https://github.com/itseez/opencv_contrib for more informations.
+@@ -85,6 +86,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ register_definitions(-DOPENMVG_STD_UNORDERED_MAP)
+ endif()
+
++if(0)
+ # ==============================================================================
+ # Check that submodule have been initialized and updated
+ # ==============================================================================
+@@ -93,6 +95,7 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
+ "\n submodule(s) are missing, please update your repository:\n"
+ " > git submodule update -i\n")
+ endif()
++endif()
+
+ # ==============================================================================
+ # Additional cmake find modules
+@@ -128,7 +131,6 @@ if (OpenMVG_USE_OPENMP)
+ find_package(OpenMP)
+ if (OPENMP_FOUND)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" ON)
+ register_definitions(-DOPENMVG_USE_OPENMP)
+ if (NOT MSVC)
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+@@ -139,11 +141,6 @@ if (OpenMVG_USE_OPENMP)
+ endif()
+ endif (NOT MSVC)
+ endif (OPENMP_FOUND)
+-else (OpenMVG_USE_OPENMP)
+- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" OFF)
+- include(UpdateCacheVariable)
+- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENMP OFF)
+- remove_definitions(-DOPENMVG_USE_OPENMP)
+ endif (OpenMVG_USE_OPENMP)
+
+ # ==============================================================================
+@@ -182,6 +179,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
+ set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw)
+ endif (OpenMVG_BUILD_OPENGL_EXAMPLES)
+
++if(0)
+ # Dependencies install rules
+ install(
+ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
+@@ -189,7 +187,7 @@ install(
+ COMPONENT headers
+ FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
+ )
+-
++endif()
+ # ==============================================================================
+ # --END-- SUBMODULE CONFIGURATION
+ # ==============================================================================
+@@ -225,6 +223,7 @@ ENDMACRO(UNIT_TEST)
+ # - external by default
+ # - internal if cereal not found
+ # ==============================================================================
++if(0)
+ find_package(cereal QUIET CONFIG)
+ if (NOT TARGET cereal)
+ add_library(cereal INTERFACE)
+@@ -237,6 +236,10 @@ if (NOT TARGET cereal)
+
+ set(OpenMVG_USE_INTERNAL_CEREAL ON)
+ endif()
++endif()
++
++find_package(cereal REQUIRED CONFIG)
++get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES)
+
+ # ==============================================================================
+ # Eigen
+@@ -245,6 +248,7 @@ endif()
+ # - external if EIGEN_INCLUDE_DIR_HINTS is defined
+ # - internal if Eigen not found
+ # ==============================================================================
++if(0)
+ find_package(Eigen3 QUIET)
+ if (NOT Eigen3_FOUND)
+ set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen)
+@@ -253,13 +257,17 @@ if (NOT Eigen3_FOUND)
+ else()
+ set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+ endif()
++endif()
+
++find_package(Eigen3 REQUIRED)
++set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+ # ==============================================================================
+ # Ceres
+ # ==============================================================================
+ # - external by default if CERES_DIR_HINTS or find_package found a valid Ceres
+ # - internal if ceres not found (ceres-solver+cxsparse+miniglog)
+ # ==============================================================================
++if(0)
+ find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS})
+ if (NOT Ceres_FOUND)
+ set(OpenMVG_USE_INTERNAL_CERES ON)
+@@ -271,13 +279,16 @@ if (NOT Ceres_FOUND)
+ STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG})
+ set(CERES_LIBRARIES openMVG_ceres)
+ endif()
++endif()
+
++find_package(Ceres REQUIRED)
+ # ==============================================================================
+ # Flann
+ # ==============================================================================
+ # - internal by default (flann),
+ # - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found
+ # ==============================================================================
++if(0)
+ if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS)
+ set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
+ set(OpenMVG_USE_INTERNAL_FLANN ON)
+@@ -286,13 +297,16 @@ find_package(Flann QUIET)
+ if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN)
+ set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
+ endif()
++endif()
+
++find_package(flann REQUIRED)
+ # ==============================================================================
+ # CoinUtils
+ # ==============================================================================
+ # - internal by default (CoinUtils),
+ # - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found
+ # ==============================================================================
++if(0)
+ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
+ set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/)
+ set(OpenMVG_USE_INTERNAL_COINUTILS ON)
+@@ -302,13 +316,16 @@ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
+ else()
+ find_package(CoinUtils QUIET)
+ endif()
++endif()
+
++find_package(CoinUtils REQUIRED)
+ ## ==============================================================================
+ ## Clp
+ ## ==============================================================================
+ ## - internal by default (Clp),
+ ## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found
+ ## ==============================================================================
++if(0)
+ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
+ set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/)
+ set(OpenMVG_USE_INTERNAL_CLP ON)
+@@ -320,6 +337,9 @@ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
+ else()
+ find_package(Clp QUIET)
+ endif()
++endif()
++
++find_package(Clp REQUIRED)
+
+ # ==============================================================================
+ # Osi
+@@ -327,6 +347,7 @@ endif()
+ # - internal by default (Osi),
+ # - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found
+ # ==============================================================================
++if(0)
+ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
+ set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/)
+ set(OpenMVG_USE_INTERNAL_OSI ON)
+@@ -336,6 +357,9 @@ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
+ else()
+ find_package(Osi QUIET)
+ endif()
++endif()
++
++find_package(Osi REQUIRED)
+
+ # ==============================================================================
+ # Internal CLP/OSI/COINUTILS libraries:
+@@ -354,6 +378,7 @@ endif()
+ # - internal by default (Lemon),
+ # - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found
+ # ==============================================================================
++if(0)
+ if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS)
+ set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon)
+ set(OpenMVG_USE_INTERNAL_LEMON ON)
+@@ -365,6 +390,9 @@ if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON)
+ ${PROJECT_BINARY_DIR}/third_party/lemon)
+ set(LEMON_LIBRARY openMVG_lemon)
+ endif()
++endif()
++
++find_package(LEMON REQUIRED)
+
+ # ==============================================================================
+ # OpenCV
+@@ -372,15 +400,13 @@ endif()
+ # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON
+ # ==============================================================================
+ if (OpenMVG_USE_OPENCV)
+- find_package( OpenCV QUIET )
+- if (NOT OpenCV_FOUND OR OpenCV_VERSION VERSION_LESS "3.0.0")
+- message(STATUS "OpenCV was not found (note that OpenCV version >= 3.0.0 is required). -> Disabling OpenCV support.")
+- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF)
+- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF)
+- endif()
++ find_package( OpenCV REQUIRED )
+ endif()
+
+-
++# ==============================================================================
++# Suitesparse
++# ==============================================================================
++find_package(suitesparse REQUIRED)
+ # ==============================================================================
+ # Third-party libraries:
+ # ==============================================================================
+@@ -472,67 +498,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT})
+
+ message("\n")
+
+-if (DEFINED OpenMVG_USE_INTERNAL_CEREAL)
++if (OpenMVG_USE_INTERNAL_CEREAL)
+ message(STATUS "CEREAL: (internal)")
+ else()
+ message(STATUS "CEREAL: (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
++if (OpenMVG_USE_INTERNAL_EIGEN)
+ message(STATUS "EIGEN: " ${EIGEN_VERSION} " (internal)")
+ else()
+ message(STATUS "EIGEN: " ${EIGEN_VERSION} " (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_CERES)
++if (OpenMVG_USE_INTERNAL_CERES)
+ message(STATUS "CERES: " ${CERES_VERSION} " (internal)")
+ else()
+ message(STATUS "CERES: " ${CERES_VERSION} " (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_FLANN)
++if (OpenMVG_USE_INTERNAL_FLANN)
+ message(STATUS "FLANN: " ${FLANN_VERSION} " (internal)")
+ else()
+ message(STATUS "FLANN: " ${FLANN_VERSION} " (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_TIFF)
++if (OpenMVG_USE_INTERNAL_TIFF)
+ message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (internal)")
+ else()
+ message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_PNG)
++if (OpenMVG_USE_INTERNAL_PNG)
+ message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (internal)")
+ else()
+ message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_JPEG)
++if (OpenMVG_USE_INTERNAL_JPEG)
+ message(STATUS "LIBJPEG (internal)")
+ else()
+ message(STATUS "LIBJPEG (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_CLP)
++if (OpenMVG_USE_INTERNAL_CLP)
+ message(STATUS "CLP: " ${CLP_VERSION} " (internal)")
+ else()
+ message(STATUS "CLP: " ${CLP_VERSION} " (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_COINUTILS)
++if (OpenMVG_USE_INTERNAL_COINUTILS)
+ message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (internal)")
+ else()
+ message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_OSI)
++if (OpenMVG_USE_INTERNAL_OSI)
+ message(STATUS "OSI: " ${OSI_VERSION} " (internal)")
+ else()
+ message(STATUS "OSI: " ${OSI_VERSION} " (external)")
+ endif()
+
+-if (DEFINED OpenMVG_USE_INTERNAL_LEMON)
++if (OpenMVG_USE_INTERNAL_LEMON)
+ message(STATUS "LEMON: " ${LEMON_VERSION} " (internal)")
+ else()
+ message(STATUS "LEMON: " ${LEMON_VERSION} " (external)")
+diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake
+index 8a69c23..6a81580 100644
+--- a/src/cmakeFindModules/FindClp.cmake
++++ b/src/cmakeFindModules/FindClp.cmake
+@@ -51,9 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "")
+ SET(CLP_INCLUDE_DIR ${CLP_DIR})
+
+ FIND_LIBRARY(CLP_LIBRARY NAMES Clp)
+- FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver)
+- FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp)
+-
++ FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp)
++ FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp)
+ # locate Clp libraries
+ IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY)
+ SET(CLP_LIBRARIES ${CLP_LIBRARY} ${CLPSOLVER_LIBRARY} ${OSICLP_LIBRARY})
+diff --git a/src/openMVG/linearProgramming/CMakeLists.txt b/src/openMVG/linearProgramming/CMakeLists.txt
+index cc5212f..acc57dd 100644
+--- a/src/openMVG/linearProgramming/CMakeLists.txt
++++ b/src/openMVG/linearProgramming/CMakeLists.txt
+@@ -15,16 +15,12 @@ target_link_libraries(openMVG_linearProgramming
+ PUBLIC
+ openMVG_numeric
+ PRIVATE
+- ${CLP_LIBRARIES} # clp + solver wrapper
+- ${COINUTILS_LIBRARY} # container tools
+- ${OSI_LIBRARY} # generic LP
++ Coin::Clp # clp + solver wrapper
++ Coin::CoinUtils # container tools
++ Coin::Osi # generic LP
+ )
+
+ target_include_directories(openMVG_linearProgramming
+- PRIVATE
+- ${CLP_INCLUDE_DIRS}
+- ${COINUTILS_INCLUDE_DIRS}
+- ${OSI_INCLUDE_DIRS}
+ PUBLIC
+ $<INSTALL_INTERFACE:include>
+ )
+diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
+index 5fcd972..b21ea7b 100644
+--- a/src/openMVG/matching/CMakeLists.txt
++++ b/src/openMVG/matching/CMakeLists.txt
+@@ -18,6 +18,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST})
+
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
++find_package(flann REQUIRED)
+
+ set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX)
+ add_library(openMVG_matching
+@@ -39,10 +40,10 @@ target_link_libraries(openMVG_matching
+ Threads::Threads
+ cereal
+ )
+-if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN)
++if (NOT OpenMVG_USE_INTERNAL_FLANN)
+ target_link_libraries(openMVG_matching
+ PUBLIC
+- ${FLANN_LIBRARIES}
++ flann::flann
+ )
+ endif()
+ set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}")
+diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
+index 816a941..f0b7145 100644
+--- a/src/third_party/CMakeLists.txt
++++ b/src/third_party/CMakeLists.txt
+@@ -18,7 +18,7 @@ add_subdirectory(stlplus3)
+ set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE)
+
+ # Add graph library
+-if(DEFINED OpenMVG_USE_INTERNAL_LEMON)
++if(OpenMVG_USE_INTERNAL_LEMON)
+ add_subdirectory(lemon)
+ set_property(TARGET openMVG_lemon PROPERTY FOLDER OpenMVG/3rdParty/lemon)
+ set_property(TARGET check PROPERTY FOLDER OpenMVG/3rdParty/lemon)
+@@ -68,7 +68,7 @@ endif (NOT TIFF_FOUND)
+ add_subdirectory(vectorGraphics)
+
+ # Add ceres-solver (A Nonlinear Least Squares Minimizer)
+-if (DEFINED OpenMVG_USE_INTERNAL_CERES)
++if (OpenMVG_USE_INTERNAL_CERES)
+ add_subdirectory(cxsparse)
+ add_subdirectory(ceres-solver)
+ set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres)
+@@ -76,7 +76,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES)
+ endif()
+
+ # Add an Approximate Nearest Neighbor library
+-if (DEFINED OpenMVG_USE_INTERNAL_FLANN)
++if (OpenMVG_USE_INTERNAL_FLANN)
+ set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp)
+ add_subdirectory(flann)
+ endif()
+@@ -90,7 +90,7 @@ add_subdirectory(fast)
+ ##
+ # Install Header only libraries if necessary
+ ##
+-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
++if (OpenMVG_USE_INTERNAL_EIGEN)
+ #Configure Eigen install
+ set(EIGEN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen)
+ add_subdirectory(eigen)
diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake index 6f4d5891f..c62ceaa4d 100644 --- a/ports/openmvg/portfile.cmake +++ b/ports/openmvg/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openMVG/openMVG - REF v1.4 - SHA512 949cf3680375c87b06db0f4713c846422c98d1979d49e9db65761f63f6f3212f0fcd8425f23c6112f04fbbb90b241638c2fd9329bb6b8b612c1d073aac55759a + REF 606d1c9e82123dd50de282128151a50bf42262fc # v1.5 + SHA512 eddcf4c5f86541112840a6d89bbf360d30b085c2b3ff3e39b357030a465163b465e89d01474f8dbd65b66f8bccfc1f54a58963324f622482e2960f00214b2b75 PATCHES fixcmake.patch fix-config-cmake.patch @@ -15,20 +15,12 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS openmp OpenMVG_USE_OPENMP + openmp ENABLE_OPENMP opencv OpenMVG_USE_OPENCV opencv OpenMVG_USE_OCVSIFT + opencv ENABLE_OPENCV ) -set(ENABLE_OPENCV OFF) -if("opencv" IN_LIST FEATURES) - set(ENABLE_OPENCV ON) -endif() - -set(ENABLE_OPENMP OFF) -if("openmp" IN_LIST FEATURES) - set(ENABLE_OPENMP ON) -endif() - # remove some deps to prevent conflict file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver ${SOURCE_PATH}/src/third_party/cxsparse @@ -96,4 +88,4 @@ endif() vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvg RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/openmvs/CONTROL b/ports/openmvs/CONTROL index 067600b84..bc06aef4a 100644 --- a/ports/openmvs/CONTROL +++ b/ports/openmvs/CONTROL @@ -1,4 +1,5 @@ Source: openmvs -Version: 1.0.1 +Version: 1.1-1 Description: OpenMVS: open Multi-View Stereo reconstruction library +Homepage: https://cdcseacave.github.io/openMVS Build-Depends: zlib, boost-iostreams, boost-program-options, boost-system, boost-serialization, eigen3, ceres, opencv, cgal[core], glew, glfw3, vcglib diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index afdebda86..e0a771751 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -1,12 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/openMVS - REF 7110659a3f5181397bc2549cea15d5350cd25c9d - SHA512 e484a88e0040b69e489476ef20c06184d2dc2bf42452b965b4997a717c2d1f19ab7cd695563c4faacdb0ec8705d072bcfd568d7b3a32e4e8b8c632bcec57e15c + REF v1.1 + SHA512 baa9149853dc08c602deeb1a04cf57643d1cb0733aee2776f4e99b210279aad3b4a1013ab1d790e91a3a95b7c72b9c12c6be25f2c30a76b69b5319b610cb8e7a HEAD_REF master ) @@ -19,7 +17,6 @@ vcpkg_configure_cmake( -DINSTALL_CMAKE_DIR:STRING=share/openmvs -DINSTALL_BIN_DIR:STRING=bin -DINSTALL_LIB_DIR:STRING=lib - -DINSTALL_INCLUDE_DIR:STRING=include ) vcpkg_install_cmake() @@ -33,4 +30,4 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/openmvs) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openmvs) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvs RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/openvdb/0001-remove-pkgconfig.patch b/ports/openvdb/0001-remove-pkgconfig.patch index 01803d531..568dec649 100644 --- a/ports/openvdb/0001-remove-pkgconfig.patch +++ b/ports/openvdb/0001-remove-pkgconfig.patch @@ -1,129 +1,145 @@ -diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake -index 03e361e..b44f46d 100644 ---- a/cmake/FindBlosc.cmake -+++ b/cmake/FindBlosc.cmake -@@ -104,11 +104,6 @@ else() - endif() - endif() - --# Additionally try and use pkconfig to find blosc -- --find_package(PkgConfig) --pkg_check_modules(PC_Blosc QUIET blosc) -- - # ------------------------------------------------------------------------ - # Search for blosc include DIR - # ------------------------------------------------------------------------ -diff --git a/cmake/FindCppUnit.cmake b/cmake/FindCppUnit.cmake -index fb8a28b..fea685e 100644 ---- a/cmake/FindCppUnit.cmake -+++ b/cmake/FindCppUnit.cmake -@@ -106,11 +106,6 @@ else() - endif() - endif() - --# Additionally try and use pkconfig to find cppunit -- --find_package(PkgConfig) --pkg_check_modules(PC_CppUnit QUIET cppunit) -- - # ------------------------------------------------------------------------ - # Search for CppUnit include DIR - # ------------------------------------------------------------------------ -diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake -index f0a0d7f..9f31355 100644 ---- a/cmake/FindIlmBase.cmake -+++ b/cmake/FindIlmBase.cmake -@@ -152,11 +152,6 @@ else() - endif() - endif() - --# Additionally try and use pkconfig to find IlmBase -- --find_package(PkgConfig) --pkg_check_modules(PC_IlmBase QUIET IlmBase) -- - # ------------------------------------------------------------------------ - # Search for IlmBase include DIR - # ------------------------------------------------------------------------ -diff --git a/cmake/FindLog4cplus.cmake b/cmake/FindLog4cplus.cmake -index 6890724..10dc931 100644 ---- a/cmake/FindLog4cplus.cmake -+++ b/cmake/FindLog4cplus.cmake -@@ -106,11 +106,6 @@ else() - endif() - endif() - --# Additionally try and use pkconfig to find log4cplus -- --find_package(PkgConfig) --pkg_check_modules(PC_Log4cplus QUIET log4cplus) -- - # ------------------------------------------------------------------------ - # Search for Log4cplus include DIR - # ------------------------------------------------------------------------ -diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake -index 302c1df..3d00c3d 100644 ---- a/cmake/FindOpenEXR.cmake -+++ b/cmake/FindOpenEXR.cmake -@@ -145,11 +145,6 @@ else() - endif() - endif() - --# Additionally try and use pkconfig to find OpenEXR -- --find_package(PkgConfig) --pkg_check_modules(PC_OpenEXR QUIET OpenEXR) -- - # ------------------------------------------------------------------------ - # Search for OpenEXR include DIR - # ------------------------------------------------------------------------ -diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index 783dfed..1fd43be 100644 ---- a/cmake/FindOpenVDB.cmake -+++ b/cmake/FindOpenVDB.cmake -@@ -153,11 +153,6 @@ else() - endif() - endif() - --# Additionally try and use pkconfig to find OpenVDB -- --find_package(PkgConfig) --pkg_check_modules(PC_OpenVDB QUIET OpenVDB) -- - # This CMake module supports being called from external packages AND from - # within the OpenVDB repository for building openvdb components with the - # core library build disabled. Determine where we are being called from: -diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake -index 01696ce..8fe73e5 100644 ---- a/cmake/FindTBB.cmake -+++ b/cmake/FindTBB.cmake -@@ -141,11 +141,6 @@ else() - endif() - endif() - --# Additionally try and use pkconfig to find Tbb -- --find_package(PkgConfig) --pkg_check_modules(PC_Tbb QUIET tbb) -- - # ------------------------------------------------------------------------ - # Search for tbb include DIR - # ------------------------------------------------------------------------ -diff --git a/cmake/OpenVDBGLFW3Setup.cmake b/cmake/OpenVDBGLFW3Setup.cmake -index 3a29dc7..4dc6269 100644 ---- a/cmake/OpenVDBGLFW3Setup.cmake -+++ b/cmake/OpenVDBGLFW3Setup.cmake -@@ -77,12 +77,6 @@ else() - endif() - endif() - --# Additionally try and use pkconfig to find glfw, though we only use --# pkg-config to re-direct to the cmake. In other words, glfw's cmake is --# expected to be installed --find_package(PkgConfig) --pkg_check_modules(PC_glfw3 QUIET glfw3) -- - if(PC_glfw3_FOUND) - foreach(DIR ${PC_glfw3_LIBRARY_DIRS}) - list(APPEND _GLFW3_ROOT_SEARCH_DIR ${DIR}) +diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
+index cc80fc5..3ead1b3 100644
+--- a/cmake/FindBlosc.cmake
++++ b/cmake/FindBlosc.cmake
+@@ -99,13 +99,6 @@ elseif(DEFINED ENV{BLOSC_ROOT})
+ set(_BLOSC_ROOT $ENV{BLOSC_ROOT})
+ endif()
+
+-# Additionally try and use pkconfig to find blosc
+-
+-if(NOT DEFINED PKG_CONFIG_FOUND)
+- find_package(PkgConfig)
+-endif()
+-pkg_check_modules(PC_Blosc QUIET blosc)
+-
+ # ------------------------------------------------------------------------
+ # Search for blosc include DIR
+ # ------------------------------------------------------------------------
+diff --git a/cmake/FindCppUnit.cmake b/cmake/FindCppUnit.cmake
+index af121ba..8fda97c 100644
+--- a/cmake/FindCppUnit.cmake
++++ b/cmake/FindCppUnit.cmake
+@@ -101,13 +101,6 @@ elseif(DEFINED ENV{CPPUNIT_ROOT})
+ set(_CPPUNIT_ROOT $ENV{CPPUNIT_ROOT})
+ endif()
+
+-# Additionally try and use pkconfig to find cppunit
+-
+-if(NOT DEFINED PKG_CONFIG_FOUND)
+- find_package(PkgConfig)
+-endif()
+-pkg_check_modules(PC_CppUnit QUIET cppunit)
+-
+ # ------------------------------------------------------------------------
+ # Search for CppUnit include DIR
+ # ------------------------------------------------------------------------
+diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
+index f20f803..00a6d30 100644
+--- a/cmake/FindIlmBase.cmake
++++ b/cmake/FindIlmBase.cmake
+@@ -142,13 +142,6 @@ elseif(DEFINED ENV{ILMBASE_ROOT})
+ set(_ILMBASE_ROOT $ENV{ILMBASE_ROOT})
+ endif()
+
+-# Additionally try and use pkconfig to find IlmBase
+-
+-if(NOT DEFINED PKG_CONFIG_FOUND)
+- find_package(PkgConfig)
+-endif()
+-pkg_check_modules(PC_IlmBase QUIET IlmBase)
+-
+ # ------------------------------------------------------------------------
+ # Search for IlmBase include DIR
+ # ------------------------------------------------------------------------
+diff --git a/cmake/FindLog4cplus.cmake b/cmake/FindLog4cplus.cmake
+index f11472e..f7388d4 100644
+--- a/cmake/FindLog4cplus.cmake
++++ b/cmake/FindLog4cplus.cmake
+@@ -101,13 +101,6 @@ elseif(DEFINED ENV{LOG4CPLUS_ROOT})
+ set(_LOG4CPLUS_ROOT $ENV{LOG4CPLUS_ROOT})
+ endif()
+
+-# Additionally try and use pkconfig to find log4cplus
+-
+-if(NOT DEFINED PKG_CONFIG_FOUND)
+- find_package(PkgConfig)
+-endif()
+-pkg_check_modules(PC_Log4cplus QUIET log4cplus)
+-
+ # ------------------------------------------------------------------------
+ # Search for Log4cplus include DIR
+ # ------------------------------------------------------------------------
+diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
+index d0d356f..3d243d0 100644
+--- a/cmake/FindOpenEXR.cmake
++++ b/cmake/FindOpenEXR.cmake
+@@ -135,13 +135,6 @@ elseif(DEFINED ENV{OPENEXR_ROOT})
+ set(_OPENEXR_ROOT $ENV{OPENEXR_ROOT})
+ endif()
+
+-# Additionally try and use pkconfig to find OpenEXR
+-
+-if(NOT DEFINED PKG_CONFIG_FOUND)
+- find_package(PkgConfig)
+-endif()
+-pkg_check_modules(PC_OpenEXR QUIET OpenEXR)
+-
+ # ------------------------------------------------------------------------
+ # Search for OpenEXR include DIR
+ # ------------------------------------------------------------------------
+diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
+index 18b1c83..01a2f04 100644
+--- a/cmake/FindOpenVDB.cmake
++++ b/cmake/FindOpenVDB.cmake
+@@ -142,13 +142,6 @@ elseif(DEFINED ENV{OPENVDB_ROOT})
+ set(_OPENVDB_ROOT $ENV{OPENVDB_ROOT})
+ endif()
+
+-# Additionally try and use pkconfig to find OpenVDB
+-
+-if(NOT DEFINED PKG_CONFIG_FOUND)
+- find_package(PkgConfig)
+-endif()
+-pkg_check_modules(PC_OpenVDB QUIET OpenVDB)
+-
+ # This CMake module supports being called from external packages AND from
+ # within the OpenVDB repository for building openvdb components with the
+ # core library build disabled. Determine where we are being called from:
+diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
+index a537300..4be895b 100644
+--- a/cmake/FindTBB.cmake
++++ b/cmake/FindTBB.cmake
+@@ -126,13 +126,6 @@ elseif(DEFINED ENV{TBB_ROOT})
+ set(_TBB_ROOT $ENV{TBB_ROOT})
+ endif()
+
+-# Additionally try and use pkconfig to find Tbb
+-
+-if(NOT DEFINED PKG_CONFIG_FOUND)
+- find_package(PkgConfig)
+-endif()
+-pkg_check_modules(PC_Tbb QUIET tbb)
+-
+ # ------------------------------------------------------------------------
+ # Search for tbb include DIR
+ # ------------------------------------------------------------------------
+diff --git a/cmake/OpenVDBGLFW3Setup.cmake b/cmake/OpenVDBGLFW3Setup.cmake
+index 84e54d9..bac685c 100644
+--- a/cmake/OpenVDBGLFW3Setup.cmake
++++ b/cmake/OpenVDBGLFW3Setup.cmake
+@@ -65,14 +65,6 @@ else()
+ endif()
+ endif()
+
+-# Additionally try and use pkconfig to find glfw, though we only use
+-# pkg-config to re-direct to the cmake. In other words, glfw's cmake is
+-# expected to be installed
+-if(NOT DEFINED PKG_CONFIG_FOUND)
+- find_package(PkgConfig)
+-endif()
+-pkg_check_modules(PC_glfw3 QUIET glfw3)
+-
+ if(PC_glfw3_FOUND)
+ foreach(DIR ${PC_glfw3_LIBRARY_DIRS})
+ list(APPEND _GLFW3_ROOT_SEARCH_DIR ${DIR})
diff --git a/ports/openvdb/0002-fix-cmake-modules.patch b/ports/openvdb/0002-fix-cmake-modules.patch index d758e5abf..35b093c81 100644 --- a/ports/openvdb/0002-fix-cmake-modules.patch +++ b/ports/openvdb/0002-fix-cmake-modules.patch @@ -1,311 +1,308 @@ -diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake -index ae84240..5630b6b 100644 ---- a/cmake/FindBlosc.cmake -+++ b/cmake/FindBlosc.cmake -@@ -86,7 +86,7 @@ may be provided to tell this module where to look. - Paths appended to all include and lib searches. - - #]=======================================================================] -- -+if (0) - mark_as_advanced( - Blosc_INCLUDE_DIR - Blosc_LIBRARY -@@ -211,3 +211,30 @@ if(Blosc_FOUND) - elseif(Blosc_FIND_REQUIRED) - message(FATAL_ERROR "Unable to find Blosc") - endif() -+else() -+FIND_PACKAGE ( PackageHandleStandardArgs ) -+FIND_PATH( BLOSC_LOCATION include/blosc.h) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc -+ REQUIRED_VARS BLOSC_LOCATION -+ ) -+IF ( BLOSC_FOUND ) -+SET ( _blosc_library_name "blosc" ) -+ # Static library setup -+ IF (Blosc_USE_STATIC_LIBS) -+ SET(CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP ${CMAKE_FIND_LIBRARY_SUFFIXES}) -+ IF (WIN32) -+ SET ( _blosc_library_name "libblosc" ) -+ ELSE () -+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") -+ ENDIF () -+ ENDIF() -+ FIND_LIBRARY ( BLOSC_blosc_LIBRARY ${_blosc_library_name} -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ # Static library tear down -+ IF (Blosc_USE_STATIC_LIBS) -+ SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} ) -+ ENDIF() -+ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" ) -+ENDIF ( BLOSC_FOUND ) -+endif() -\ No newline at end of file -diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake -index c58083e..438fc83 100644 ---- a/cmake/FindIlmBase.cmake -+++ b/cmake/FindIlmBase.cmake -@@ -100,7 +100,7 @@ may be provided to tell this module where to look. - Paths appended to all include and lib searches. - - #]=======================================================================] -- -+if (0) - # Support new if() IN_LIST operator - if(POLICY CMP0057) - cmake_policy(SET CMP0057 NEW) -@@ -330,3 +330,144 @@ if(IlmBase_FOUND) - elseif(IlmBase_FIND_REQUIRED) - message(FATAL_ERROR "Unable to find IlmBase") - endif() -+else() -+FIND_PACKAGE ( PackageHandleStandardArgs ) -+FIND_PATH ( ILMBASE_LOCATION include/OpenEXR/IlmBaseConfig.h) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS ( ILMBase -+ REQUIRED_VARS ILMBASE_LOCATION -+ ) -+OPTION ( ILMBASE_NAMESPACE_VERSIONING "Namespace versioning of libraries" ON ) -+ -+IF ( ILMBASE_FOUND ) -+ -+ FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR ") -+ STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" _ilmbase_version_major_unstrip "${_ilmbase_version_major_string}") -+ STRING ( STRIP "${_ilmbase_version_major_unstrip}" ILMBASE_VERSION_MAJOR ) -+ -+ FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR ") -+ STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" _ilmbase_version_minor_unstrip "${_ilmbase_version_minor_string}") -+ STRING ( STRIP "${_ilmbase_version_minor_unstrip}" ILMBASE_VERSION_MINOR ) -+ -+ IF ( ILMBASE_NAMESPACE_VERSIONING ) -+ SET ( IEX_LIBRARY_NAME Iex-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) -+ SET ( IEXMATH_LIBRARY_NAME IexMath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) -+ SET ( ILMTHREAD_LIBRARY_NAME IlmThread-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) -+ SET ( IMATH_LIBRARY_NAME Imath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) -+ SET ( HALF_LIBRARY_NAME Half-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) -+ ELSE ( ILMBASE_NAMESPACE_VERSIONING ) -+ SET ( IEX_LIBRARY_NAME Iex ) -+ SET ( IEXMATH_LIBRARY_NAME IexMath ) -+ SET ( ILMTHREAD_LIBRARY_NAME IlmThread ) -+ SET ( IMATH_LIBRARY_NAME Imath ) -+ SET ( HALF_LIBRARY_NAME Half ) -+ ENDIF ( ILMBASE_NAMESPACE_VERSIONING ) -+ -+ SET ( ILMBASE_INCLUDE_DIRS -+ ${ILMBASE_LOCATION}/include -+ ${ILMBASE_LOCATION}/include/OpenEXR -+ CACHE STRING "ILMBase include directories") -+ SET ( ILMBASE_LIBRARYDIR ${ILMBASE_LOCATION}/lib -+ CACHE STRING "ILMBase library directories") -+ SET ( ILMBASE_FOUND TRUE ) -+ -+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) -+ IF (Ilmbase_USE_STATIC_LIBS) -+ IF (APPLE) -+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") -+ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY Iex PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY IlmThread PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY Imath PATHS ${ILMBASE_LIBRARYDIR} ) -+ ELSEIF (WIN32) -+ # Link library -+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") -+ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half_static PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY Iex_static PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY IlmThread_static PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY Imath_static PATHS ${ILMBASE_LIBRARYDIR} ) -+ ELSE (APPLE) -+ SET ( CMAKE_FIND_LIBRARY_SUFFIXES ".a") -+ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY Iex PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY IlmThread PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY Imath PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ ENDIF (APPLE) -+ ELSE (Ilmbase_USE_STATIC_LIBS) -+ IF (APPLE) -+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib") -+ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY Iex PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY IlmThread PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY Imath PATHS ${ILMBASE_LIBRARYDIR} ) -+ ELSEIF (WIN32) -+ # Link library -+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") -+ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IEXMATH_LIBRARY ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) -+ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} ) -+ # Load library -+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll") -+ FIND_LIBRARY ( Ilmbase_HALF_DLL ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LOCATION}/bin -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_IEX_DLL ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_IEXMATH_DLL ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_ILMTHREAD_DLL ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_IMATH_DLL ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ ELSE (APPLE) -+ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_IEXMATH_LIBRARY ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} -+ NO_DEFAULT_PATH -+ NO_SYSTEM_ENVIRONMENT_PATH -+ ) -+ ENDIF (APPLE) -+ ENDIF () -+ # MUST reset -+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+ELSE ( ILMBASE_FOUND ) -+ MESSAGE ( FATAL_ERROR "Unable to find ILMBase, ILMBASE_ROOT = $ENV{ILMBASE_ROOT}") -+ENDIF ( ILMBASE_FOUND ) -+endif() -\ No newline at end of file -diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake -index 98bd53d..c3b449e 100644 ---- a/cmake/FindOpenEXR.cmake -+++ b/cmake/FindOpenEXR.cmake -@@ -96,7 +96,7 @@ may be provided to tell this module where to look. - Paths appended to all include and lib searches. - - #]=======================================================================] -- -+if (0) - # Support new if() IN_LIST operator - if(POLICY CMP0057) - cmake_policy(SET CMP0057 NEW) -@@ -322,3 +322,92 @@ if(OpenEXR_FOUND) - elseif(OpenEXR_FIND_REQUIRED) - message(FATAL_ERROR "Unable to find OpenEXR") - endif() -+else() -+include(FindPackageHandleStandardArgs) -+ -+find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h) -+find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR) -+ -+file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H) -+ -+string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}") -+string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}") -+set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}") -+ -+include(SelectLibraryConfigurations) -+ -+if(NOT OpenEXR_BASE_LIBRARY) -+ find_library(OpenEXR_BASE_LIBRARY_RELEASE NAMES IlmImf-${OpenEXR_LIB_SUFFIX}) -+ find_library(OpenEXR_BASE_LIBRARY_DEBUG NAMES IlmImf-${OpenEXR_LIB_SUFFIX}_d) -+ select_library_configurations(OpenEXR_BASE) -+endif() -+ -+if(NOT OpenEXR_UTIL_LIBRARY) -+ find_library(OpenEXR_UTIL_LIBRARY_RELEASE NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX}) -+ find_library(OpenEXR_UTIL_LIBRARY_DEBUG NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX}_d) -+ select_library_configurations(OpenEXR_UTIL) -+endif() -+ -+if(NOT OpenEXR_HALF_LIBRARY) -+ find_library(OpenEXR_HALF_LIBRARY_RELEASE NAMES Half-${OpenEXR_LIB_SUFFIX}) -+ find_library(OpenEXR_HALF_LIBRARY_DEBUG NAMES Half-${OpenEXR_LIB_SUFFIX}_d) -+ select_library_configurations(OpenEXR_HALF) -+endif() -+ -+if(NOT OpenEXR_IEX_LIBRARY) -+ find_library(OpenEXR_IEX_LIBRARY_RELEASE NAMES Iex-${OpenEXR_LIB_SUFFIX}) -+ find_library(OpenEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OpenEXR_LIB_SUFFIX}_d) -+ select_library_configurations(OpenEXR_IEX) -+endif() -+ -+if(NOT OpenEXR_MATH_LIBRARY) -+ find_library(OpenEXR_MATH_LIBRARY_RELEASE NAMES Imath-${OpenEXR_LIB_SUFFIX}) -+ find_library(OpenEXR_MATH_LIBRARY_DEBUG NAMES Imath-${OpenEXR_LIB_SUFFIX}_d) -+ select_library_configurations(OpenEXR_MATH) -+endif() -+ -+if(NOT OpenEXR_THREAD_LIBRARY) -+ find_library(OpenEXR_THREAD_LIBRARY_RELEASE NAMES IlmThread-${OpenEXR_LIB_SUFFIX}) -+ find_library(OpenEXR_THREAD_LIBRARY_DEBUG NAMES IlmThread-${OpenEXR_LIB_SUFFIX}_d) -+ select_library_configurations(OpenEXR_THREAD) -+endif() -+ -+if(NOT OpenEXR_IEXMATH_LIBRARY) -+ find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX}) -+ find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}d) -+ select_library_configurations(OpenEXR_IEXMATH) -+endif() -+ -+set(OPENEXR_HALF_LIBRARY "${OpenEXR_HALF_LIBRARY}") -+set(OPENEXR_IEX_LIBRARY "${OpenEXR_IEX_LIBRARY}") -+set(OPENEXR_IMATH_LIBRARY "${OpenEXR_MATH_LIBRARY}") -+set(OPENEXR_ILMIMF_LIBRARY "${OpenEXR_BASE_LIBRARY}") -+set(OPENEXR_ILMIMFUTIL_LIBRARY "${OpenEXR_UTIL_LIBRARY}") -+set(OPENEXR_ILMTHREAD_LIBRARY "${OpenEXR_THREAD_LIBRARY}") -+ -+set(OpenEXR_LIBRARY "${OpenEXR_BASE_LIBRARY}") -+ -+set(OpenEXR_LIBRARIES -+ ${OpenEXR_LIBRARY} -+ ${OpenEXR_MATH_LIBRARY} -+ ${OpenEXR_IEXMATH_LIBRARY} -+ ${OpenEXR_UTIL_LIBRARY} -+ ${OpenEXR_HALF_LIBRARY} -+ ${OpenEXR_IEX_LIBRARY} -+ ${OpenEXR_THREAD_LIBRARY} -+) -+ -+set(OPENEXR_LIBRARIES -+ ${OPENEXR_HALF_LIBRARY} -+ ${OPENEXR_IEX_LIBRARY} -+ ${OPENEXR_IMATH_LIBRARY} -+ ${OPENEXR_ILMIMF_LIBRARY} -+ ${OPENEXR_ILMTHREAD_LIBRARY} -+) -+ -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS) -+ -+if(OpenEXR_FOUND) -+ set(OPENEXR_FOUND 1) -+endif() -+endif() -\ No newline at end of file +diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
+index 3ead1b3..0522e4a 100644
+--- a/cmake/FindBlosc.cmake
++++ b/cmake/FindBlosc.cmake
+@@ -75,6 +75,7 @@ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 NEW)
+ endif()
+
++if(0)
+ mark_as_advanced(
+ Blosc_INCLUDE_DIR
+ Blosc_LIBRARY
+@@ -206,3 +207,30 @@ if(Blosc_FOUND)
+ elseif(Blosc_FIND_REQUIRED)
+ message(FATAL_ERROR "Unable to find Blosc")
+ endif()
++else()
++FIND_PACKAGE ( PackageHandleStandardArgs )
++FIND_PATH( BLOSC_LOCATION include/blosc.h)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc
++ REQUIRED_VARS BLOSC_LOCATION
++ )
++IF ( BLOSC_FOUND )
++SET ( _blosc_library_name "blosc" )
++ # Static library setup
++ IF (Blosc_USE_STATIC_LIBS)
++ SET(CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP ${CMAKE_FIND_LIBRARY_SUFFIXES})
++ IF (WIN32)
++ SET ( _blosc_library_name "libblosc" )
++ ELSE ()
++ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
++ ENDIF ()
++ ENDIF()
++ FIND_LIBRARY ( BLOSC_blosc_LIBRARY ${_blosc_library_name}
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ # Static library tear down
++ IF (Blosc_USE_STATIC_LIBS)
++ SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
++ ENDIF()
++ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
++ENDIF ( BLOSC_FOUND )
++endif()
+\ No newline at end of file
+diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
+index 00a6d30..10322fd 100644
+--- a/cmake/FindIlmBase.cmake
++++ b/cmake/FindIlmBase.cmake
+@@ -84,6 +84,7 @@ may be provided to tell this module where to look.
+
+ cmake_minimum_required(VERSION 3.3)
+
++if(0)
+ # Monitoring <PackageName>_ROOT variables
+ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 NEW)
+@@ -320,3 +321,144 @@ if(IlmBase_FOUND)
+ elseif(IlmBase_FIND_REQUIRED)
+ message(FATAL_ERROR "Unable to find IlmBase")
+ endif()
++else()
++FIND_PACKAGE ( PackageHandleStandardArgs )
++FIND_PATH ( ILMBASE_LOCATION include/OpenEXR/IlmBaseConfig.h)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS ( ILMBase
++ REQUIRED_VARS ILMBASE_LOCATION
++ )
++OPTION ( ILMBASE_NAMESPACE_VERSIONING "Namespace versioning of libraries" ON )
++
++IF ( ILMBASE_FOUND )
++
++ FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR ")
++ STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" _ilmbase_version_major_unstrip "${_ilmbase_version_major_string}")
++ STRING ( STRIP "${_ilmbase_version_major_unstrip}" ILMBASE_VERSION_MAJOR )
++
++ FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR ")
++ STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" _ilmbase_version_minor_unstrip "${_ilmbase_version_minor_string}")
++ STRING ( STRIP "${_ilmbase_version_minor_unstrip}" ILMBASE_VERSION_MINOR )
++
++ IF ( ILMBASE_NAMESPACE_VERSIONING )
++ SET ( IEX_LIBRARY_NAME Iex-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
++ SET ( IEXMATH_LIBRARY_NAME IexMath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
++ SET ( ILMTHREAD_LIBRARY_NAME IlmThread-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
++ SET ( IMATH_LIBRARY_NAME Imath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
++ SET ( HALF_LIBRARY_NAME Half-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
++ ELSE ( ILMBASE_NAMESPACE_VERSIONING )
++ SET ( IEX_LIBRARY_NAME Iex )
++ SET ( IEXMATH_LIBRARY_NAME IexMath )
++ SET ( ILMTHREAD_LIBRARY_NAME IlmThread )
++ SET ( IMATH_LIBRARY_NAME Imath )
++ SET ( HALF_LIBRARY_NAME Half )
++ ENDIF ( ILMBASE_NAMESPACE_VERSIONING )
++
++ SET ( ILMBASE_INCLUDE_DIRS
++ ${ILMBASE_LOCATION}/include
++ ${ILMBASE_LOCATION}/include/OpenEXR
++ CACHE STRING "ILMBase include directories")
++ SET ( ILMBASE_LIBRARYDIR ${ILMBASE_LOCATION}/lib
++ CACHE STRING "ILMBase library directories")
++ SET ( ILMBASE_FOUND TRUE )
++
++ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
++ IF (Ilmbase_USE_STATIC_LIBS)
++ IF (APPLE)
++ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
++ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY Iex PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY IlmThread PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY Imath PATHS ${ILMBASE_LIBRARYDIR} )
++ ELSEIF (WIN32)
++ # Link library
++ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
++ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half_static PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY Iex_static PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY IlmThread_static PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY Imath_static PATHS ${ILMBASE_LIBRARYDIR} )
++ ELSE (APPLE)
++ SET ( CMAKE_FIND_LIBRARY_SUFFIXES ".a")
++ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY Iex PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY IlmThread PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY Imath PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ ENDIF (APPLE)
++ ELSE (Ilmbase_USE_STATIC_LIBS)
++ IF (APPLE)
++ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib")
++ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY Iex PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY IlmThread PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY Imath PATHS ${ILMBASE_LIBRARYDIR} )
++ ELSEIF (WIN32)
++ # Link library
++ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
++ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IEXMATH_LIBRARY ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
++ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
++ # Load library
++ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
++ FIND_LIBRARY ( Ilmbase_HALF_DLL ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LOCATION}/bin
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_IEX_DLL ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_IEXMATH_DLL ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_ILMTHREAD_DLL ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_IMATH_DLL ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ ELSE (APPLE)
++ FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_IEX_LIBRARY ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_IEXMATH_LIBRARY ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
++ NO_DEFAULT_PATH
++ NO_SYSTEM_ENVIRONMENT_PATH
++ )
++ ENDIF (APPLE)
++ ENDIF ()
++ # MUST reset
++ SET(CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++ELSE ( ILMBASE_FOUND )
++ MESSAGE ( FATAL_ERROR "Unable to find ILMBase, ILMBASE_ROOT = $ENV{ILMBASE_ROOT}")
++ENDIF ( ILMBASE_FOUND )
++endif()
+\ No newline at end of file
+diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
+index 3d243d0..a3340da 100644
+--- a/cmake/FindOpenEXR.cmake
++++ b/cmake/FindOpenEXR.cmake
+@@ -80,6 +80,7 @@ may be provided to tell this module where to look.
+
+ cmake_minimum_required(VERSION 3.3)
+
++if(0)
+ # Monitoring <PackageName>_ROOT variables
+ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 NEW)
+@@ -312,3 +313,92 @@ if(OpenEXR_FOUND)
+ elseif(OpenEXR_FIND_REQUIRED)
+ message(FATAL_ERROR "Unable to find OpenEXR")
+ endif()
++else()
++include(FindPackageHandleStandardArgs)
++
++find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h)
++find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
++
++file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H)
++
++string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}")
++string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}")
++set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}")
++
++include(SelectLibraryConfigurations)
++
++if(NOT OpenEXR_BASE_LIBRARY)
++ find_library(OpenEXR_BASE_LIBRARY_RELEASE NAMES IlmImf-${OpenEXR_LIB_SUFFIX})
++ find_library(OpenEXR_BASE_LIBRARY_DEBUG NAMES IlmImf-${OpenEXR_LIB_SUFFIX}_d)
++ select_library_configurations(OpenEXR_BASE)
++endif()
++
++if(NOT OpenEXR_UTIL_LIBRARY)
++ find_library(OpenEXR_UTIL_LIBRARY_RELEASE NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX})
++ find_library(OpenEXR_UTIL_LIBRARY_DEBUG NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX}_d)
++ select_library_configurations(OpenEXR_UTIL)
++endif()
++
++if(NOT OpenEXR_HALF_LIBRARY)
++ find_library(OpenEXR_HALF_LIBRARY_RELEASE NAMES Half-${OpenEXR_LIB_SUFFIX})
++ find_library(OpenEXR_HALF_LIBRARY_DEBUG NAMES Half-${OpenEXR_LIB_SUFFIX}_d)
++ select_library_configurations(OpenEXR_HALF)
++endif()
++
++if(NOT OpenEXR_IEX_LIBRARY)
++ find_library(OpenEXR_IEX_LIBRARY_RELEASE NAMES Iex-${OpenEXR_LIB_SUFFIX})
++ find_library(OpenEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OpenEXR_LIB_SUFFIX}_d)
++ select_library_configurations(OpenEXR_IEX)
++endif()
++
++if(NOT OpenEXR_MATH_LIBRARY)
++ find_library(OpenEXR_MATH_LIBRARY_RELEASE NAMES Imath-${OpenEXR_LIB_SUFFIX})
++ find_library(OpenEXR_MATH_LIBRARY_DEBUG NAMES Imath-${OpenEXR_LIB_SUFFIX}_d)
++ select_library_configurations(OpenEXR_MATH)
++endif()
++
++if(NOT OpenEXR_THREAD_LIBRARY)
++ find_library(OpenEXR_THREAD_LIBRARY_RELEASE NAMES IlmThread-${OpenEXR_LIB_SUFFIX})
++ find_library(OpenEXR_THREAD_LIBRARY_DEBUG NAMES IlmThread-${OpenEXR_LIB_SUFFIX}_d)
++ select_library_configurations(OpenEXR_THREAD)
++endif()
++
++if(NOT OpenEXR_IEXMATH_LIBRARY)
++ find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX})
++ find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}d)
++ select_library_configurations(OpenEXR_IEXMATH)
++endif()
++
++set(OPENEXR_HALF_LIBRARY "${OpenEXR_HALF_LIBRARY}")
++set(OPENEXR_IEX_LIBRARY "${OpenEXR_IEX_LIBRARY}")
++set(OPENEXR_IMATH_LIBRARY "${OpenEXR_MATH_LIBRARY}")
++set(OPENEXR_ILMIMF_LIBRARY "${OpenEXR_BASE_LIBRARY}")
++set(OPENEXR_ILMIMFUTIL_LIBRARY "${OpenEXR_UTIL_LIBRARY}")
++set(OPENEXR_ILMTHREAD_LIBRARY "${OpenEXR_THREAD_LIBRARY}")
++
++set(OpenEXR_LIBRARY "${OpenEXR_BASE_LIBRARY}")
++
++set(OpenEXR_LIBRARIES
++ ${OpenEXR_LIBRARY}
++ ${OpenEXR_MATH_LIBRARY}
++ ${OpenEXR_IEXMATH_LIBRARY}
++ ${OpenEXR_UTIL_LIBRARY}
++ ${OpenEXR_HALF_LIBRARY}
++ ${OpenEXR_IEX_LIBRARY}
++ ${OpenEXR_THREAD_LIBRARY}
++)
++
++set(OPENEXR_LIBRARIES
++ ${OPENEXR_HALF_LIBRARY}
++ ${OPENEXR_IEX_LIBRARY}
++ ${OPENEXR_IMATH_LIBRARY}
++ ${OPENEXR_ILMIMF_LIBRARY}
++ ${OPENEXR_ILMTHREAD_LIBRARY}
++)
++
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS)
++
++if(OpenEXR_FOUND)
++ set(OPENEXR_FOUND 1)
++endif()
++endif()
+\ No newline at end of file
diff --git a/ports/openvdb/0003-fix-cmake.patch b/ports/openvdb/0003-fix-cmake.patch index b25bdbd08..73adc9151 100644 --- a/ports/openvdb/0003-fix-cmake.patch +++ b/ports/openvdb/0003-fix-cmake.patch @@ -1,130 +1,133 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 580b353..d40418c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -274,7 +274,6 @@ if(OPENVDB_INSTALL_CMAKE_MODULES) - cmake/FindLog4cplus.cmake - cmake/FindOpenEXR.cmake - cmake/FindOpenVDB.cmake -- cmake/FindTBB.cmake - cmake/OpenVDBGLFW3Setup.cmake - cmake/OpenVDBHoudiniSetup.cmake - cmake/OpenVDBMayaSetup.cmake -diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index dd9b0b3..36ec0d0 100644 ---- a/cmake/FindOpenVDB.cmake -+++ b/cmake/FindOpenVDB.cmake -@@ -310,7 +310,7 @@ endif() - # Add standard dependencies - - find_package(IlmBase REQUIRED COMPONENTS Half) --find_package(TBB REQUIRED COMPONENTS tbb) -+find_package(TBB CONFIG REQUIRED) - find_package(ZLIB REQUIRED) - find_package(Boost REQUIRED COMPONENTS iostreams system) - -diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt -index 89301bd..e363a13 100644 ---- a/openvdb/CMakeLists.txt -+++ b/openvdb/CMakeLists.txt -@@ -71,16 +71,10 @@ message(STATUS "----------------------------------------------------") - # Collect and configure lib dependencies - - if(USE_EXR) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED) -- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED) -+ find_package(IlmBase REQUIRED) -+ find_package(OpenEXR REQUIRED) - else() -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) --endif() -- --find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) --if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) -- message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} " -- "is deprecated and will be removed.") -+ find_package(IlmBase REQUIRED COMPONENTS Half) - endif() - - find_package(ZLIB ${MINIMUM_ZLIB_VERSION} REQUIRED) -@@ -117,10 +111,10 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") - message(WARNING "Unable to find Jemalloc, attempting to fall back to TBB malloc. - It is recommended to use Jemalloc for optimum performance." - ) -- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc tbbmalloc_proxy) -+ find_package(TBB CONFIG REQUIRED) - endif() - elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc") -- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc tbbmalloc_proxy) -+ find_package(TBB CONFIG REQUIRED) - endif() - - # Set deps. Note that the order here is important. If we're building against -@@ -132,15 +126,15 @@ endif() - set(OPENVDB_CORE_DEPENDENT_LIBS - Boost::iostreams - Boost::system -- IlmBase::Half -+ ${Ilmbase_HALF_LIBRARY} - ) - - if(USE_EXR) - list(APPEND OPENVDB_CORE_DEPENDENT_LIBS -- IlmBase::IlmThread -- IlmBase::Iex -- IlmBase::Imath -- OpenEXR::IlmImf -+ ${Ilmbase_ILMTHREAD_LIBRARY} -+ ${Ilmbase_IEX_LIBRARY} -+ ${Ilmbase_IMATH_LIBRARY} -+ ${OPENEXR_ILMIMF_LIBRARY} - ) - endif() - -@@ -152,7 +146,7 @@ endif() - # See FindOpenVDB.cmake - - if(USE_BLOSC) -- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) -+ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS ${BLOSC_blosc_LIBRARY}) - endif() - - list(APPEND OPENVDB_CORE_DEPENDENT_LIBS -@@ -187,7 +181,11 @@ endif() - - # @todo Should be target definitions - if(WIN32) -- add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL) -+ add_definitions(-D_WIN32 -DNOMINMAX) -+ add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE -D__TBBMALLOC_NO_IMPLICIT_LINKAGE) -+ if (OPENVDB_SHARED) -+ add_definitions(-DOPENEXR_DLL -DOPENVDB_DLL) -+ endif() - endif() - - ##### Core library configuration -@@ -404,6 +402,7 @@ list(APPEND OPENVDB_CORE_PRIVATE_DEFINES "-DOPENVDB_PRIVATE") - if(USE_BLOSC) - list(APPEND OPENVDB_CORE_PRIVATE_DEFINES "-DOPENVDB_USE_BLOSC") - endif() -+list(APPEND OPENVDB_CORE_PRIVATE_DEFINES "$<$<CXX_COMPILER_ID:MSVC>:/bigobj>") - - # Public defines - -diff --git a/openvdb/cmd/CMakeLists.txt b/openvdb/cmd/CMakeLists.txt -index 57fbec0..d817044 100644 ---- a/openvdb/cmd/CMakeLists.txt -+++ b/openvdb/cmd/CMakeLists.txt -@@ -155,9 +155,9 @@ if(OPENVDB_BUILD_VDB_RENDER) - # headers - - target_link_libraries(vdb_render -- OpenEXR::IlmImf -- IlmBase::IlmThread -- IlmBase::Iex -+ ${OPENEXR_ILMIMF_LIBRARY} -+ ${Ilmbase_ILMTHREAD_LIBRARY} -+ ${Ilmbase_IEX_LIBRARY} - ${OPENVDB_BINARIES_DEPENDENT_LIBS} - ) - +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d7c4ff8..123e50f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -302,7 +302,6 @@ if(OPENVDB_INSTALL_CMAKE_MODULES)
+ cmake/FindLog4cplus.cmake
+ cmake/FindOpenEXR.cmake
+ cmake/FindOpenVDB.cmake
+- cmake/FindTBB.cmake
+ cmake/OpenVDBGLFW3Setup.cmake
+ cmake/OpenVDBHoudiniSetup.cmake
+ cmake/OpenVDBMayaSetup.cmake
+diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
+index 01a2f04..16b71bb 100644
+--- a/cmake/FindOpenVDB.cmake
++++ b/cmake/FindOpenVDB.cmake
+@@ -299,7 +299,7 @@ endif()
+ # Add standard dependencies
+
+ find_package(IlmBase REQUIRED COMPONENTS Half)
+-find_package(TBB REQUIRED COMPONENTS tbb)
++find_package(TBB CONFIG REQUIRED)
+ find_package(ZLIB REQUIRED)
+
+ if(NOT OPENVDB_USE_STATIC_LIBS)
+diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+index 9501ff1..ab14fd9 100644
+--- a/openvdb/CMakeLists.txt
++++ b/openvdb/CMakeLists.txt
+@@ -48,6 +48,7 @@ message(STATUS "----------------------------------------------------")
+
+ # Collect and configure lib dependencies
+
++if(0)
+ if(USE_EXR)
+ find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED)
+ find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED)
+@@ -76,6 +77,14 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
+ "is deprecated and will be removed.")
+ endif()
+ endif()
++endif()
++
++if(USE_EXR)
++ find_package(IlmBase REQUIRED)
++ find_package(OpenEXR REQUIRED)
++else()
++ find_package(IlmBase REQUIRED COMPONENTS Half)
++endif()
+
+ find_package(ZLIB ${MINIMUM_ZLIB_VERSION} REQUIRED)
+
+@@ -127,10 +136,10 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
+ message(WARNING "Unable to find Jemalloc, attempting to fall back to TBB malloc.
+ It is recommended to use Jemalloc for optimum performance."
+ )
+- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc tbbmalloc_proxy)
++ find_package(TBB CONFIG REQUIRED)
+ endif()
+ elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc")
+- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc tbbmalloc_proxy)
++ find_package(TBB CONFIG REQUIRED)
+ endif()
+
+ # Set deps. Note that the order here is important. If we're building against
+@@ -142,15 +151,15 @@ endif()
+ set(OPENVDB_CORE_DEPENDENT_LIBS
+ Boost::iostreams
+ Boost::system
+- IlmBase::Half
++ ${Ilmbase_HALF_LIBRARY}
+ )
+
+ if(USE_EXR)
+ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS
+- IlmBase::IlmThread
+- IlmBase::Iex
+- IlmBase::Imath
+- OpenEXR::IlmImf
++ ${Ilmbase_ILMTHREAD_LIBRARY}
++ ${Ilmbase_IEX_LIBRARY}
++ ${Ilmbase_IMATH_LIBRARY}
++ ${OPENEXR_ILMIMF_LIBRARY}
+ )
+ endif()
+
+@@ -162,7 +171,7 @@ endif()
+ # See FindOpenVDB.cmake
+
+ if(USE_BLOSC)
+- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
++ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS ${BLOSC_blosc_LIBRARY})
+ endif()
+
+ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS
+@@ -197,7 +206,11 @@ endif()
+
+ # @todo Should be target definitions
+ if(WIN32)
+- add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL)
++ add_definitions(-D_WIN32 -DNOMINMAX)
++ add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE -D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
++ if (OPENVDB_SHARED)
++ add_definitions(-DOPENEXR_DLL -DOPENVDB_DLL)
++ endif()
+ endif()
+
+ ##### Core library configuration
+@@ -415,6 +428,7 @@ if(USE_BLOSC)
+ list(APPEND OPENVDB_CORE_PRIVATE_DEFINES "-DOPENVDB_USE_BLOSC")
+ endif()
+
++list(APPEND OPENVDB_CORE_PRIVATE_DEFINES "$<$<CXX_COMPILER_ID:MSVC>:/bigobj>")
+ # Public defines
+
+ if(USE_EXR)
+diff --git a/openvdb/cmd/CMakeLists.txt b/openvdb/cmd/CMakeLists.txt
+index 1e5ef0d..8e78efe 100644
+--- a/openvdb/cmd/CMakeLists.txt
++++ b/openvdb/cmd/CMakeLists.txt
+@@ -133,9 +133,9 @@ if(OPENVDB_BUILD_VDB_RENDER)
+ # headers
+
+ target_link_libraries(vdb_render
+- OpenEXR::IlmImf
+- IlmBase::IlmThread
+- IlmBase::Iex
++ ${OPENEXR_ILMIMF_LIBRARY}
++ ${Ilmbase_ILMTHREAD_LIBRARY}
++ ${Ilmbase_IEX_LIBRARY}
+ ${OPENVDB_BINARIES_DEPENDENT_LIBS}
+ )
+
diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index ab9540980..c3e9a9849 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,5 +1,5 @@ Source: openvdb -Version: 6.2.1 +Version: 7.0.0 Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess, ilmbase Homepage: https://github.com/dreamworksanimation/openvdb Description: Sparse volume data structure and tools diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index dd09fbb40..964088eee 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openvdb - REF aebaf8d95be5e57fd33949281ec357db4a576c2e # v6.2.1 - SHA512 e5cf03e77ed0600252cb97aa4bbf9468345ad037a3053626900bd8233e89720f981f0706e5103c2d33ea9c246ba1cf695af68e60d395e5be90e655f2e127db9b + REF c5e9e2944f085907e973b627843c49c838afe912 # v7.0.0 + SHA512 351611b04a192bcc501da599e55892a5dc7570dce6c0aea287d800612a20f6cb2a0d7825e062aa99f12bc2a968c51c7fe6af61badfdbd746edbd4e9fc9e4f2a4 HEAD_REF master PATCHES 0001-remove-pkgconfig.patch diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 8df250d7c..b958ad092 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -2,7 +2,7 @@ Source: osg Version: 3.6.4-1 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. -Build-Depends: freetype, jasper, openexr, zlib, gdal, giflib, libjpeg-turbo, libpng, tiff, fontconfig, sdl2, boost-asio (!windows), libxml2 (windows), giflib (windows), freeglut (windows) +Build-Depends: freetype, jasper, openexr, zlib, gdal, giflib, libjpeg-turbo, libpng, tiff, fontconfig, sdl2, boost-asio (!windows), libxml2 (windows), giflib (windows), freeglut (windows), expat (windows), libiconv (windows) Feature: collada Description: Support for Collada (.dae) files diff --git a/ports/osg/disable-present3d-staticview-in-linux.patch b/ports/osg/disable-present3d-staticview-in-linux.patch new file mode 100644 index 000000000..fd76db35b --- /dev/null +++ b/ports/osg/disable-present3d-staticview-in-linux.patch @@ -0,0 +1,36 @@ +diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt +index ab491c6..bee3d1f 100644 +--- a/applications/CMakeLists.txt ++++ b/applications/CMakeLists.txt +@@ -32,12 +32,16 @@ IF(DYNAMIC_OPENSCENEGRAPH) + ADD_SUBDIRECTORY(osgconv) + ADD_SUBDIRECTORY(osgfilecache) + ADD_SUBDIRECTORY(osgversion) +- ADD_SUBDIRECTORY(present3D) ++ if (NOT UNIX) ++ ADD_SUBDIRECTORY(present3D) ++ endif() + ELSE() + # need to define this on win32 or linker cries about _declspecs + ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) + + ADD_SUBDIRECTORY(osgversion) +- ADD_SUBDIRECTORY(present3D) ++ if (NOT UNIX) ++ ADD_SUBDIRECTORY(present3D) ++ endif() + ENDIF() + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 788e507..3c550bc 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -245,7 +245,7 @@ ELSE(DYNAMIC_OPENSCENEGRAPH) + + IF(OSG_BUILD_PLATFORM_IPHONE) + ADD_SUBDIRECTORY(osgviewerIPhone) +- ELSE() ++ ELSEIF (NOT UNIX) + ADD_SUBDIRECTORY(osgstaticviewer) + ENDIF() + diff --git a/ports/osg/fix-builderror-with-libtiff.patch b/ports/osg/fix-builderror-with-libtiff.patch new file mode 100644 index 000000000..d3a938e42 --- /dev/null +++ b/ports/osg/fix-builderror-with-libtiff.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeModules/OsgAndroidMacroUtils.cmake b/CMakeModules/OsgAndroidMacroUtils.cmake
+index 50c22e0..8e79b09 100644
+--- a/CMakeModules/OsgAndroidMacroUtils.cmake
++++ b/CMakeModules/OsgAndroidMacroUtils.cmake
+@@ -118,7 +118,7 @@ MACRO(ANDROID_3RD_PARTY)
+ #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${TIFF_INCLUDE_DIR}/Android.mk \n")
+ if(TIFF_INCLUDE_DIR)
+ message(STATUS "TIF found ${TIFF_INCLUDE_DIR}" )
+- set(TIFF_FOUND "Yes")
++ #set(TIFF_FOUND "Yes")
+ install(DIRECTORY 3rdparty/build/libtiff/ DESTINATION ./ )
+ else(TIFF_INCLUDE_DIR)
+ message(STATUS "TIF missing" )
+diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
+index 77d66f8..1504bf9 100644
+--- a/src/osgPlugins/CMakeLists.txt
++++ b/src/osgPlugins/CMakeLists.txt
+@@ -115,7 +115,7 @@ IF(PNG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+ ADD_PLUGIN_DIRECTORY(png)
+ ENDIF()
+ IF(TIFF_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+- ADD_PLUGIN_DIRECTORY(tiff)
++ #ADD_PLUGIN_DIRECTORY(tiff)
+ ENDIF()
+ IF(GDAL_FOUND)
+ ADD_PLUGIN_DIRECTORY(gdal)
diff --git a/ports/osg/fix-curl.patch b/ports/osg/fix-curl.patch new file mode 100644 index 000000000..e95fbee5d --- /dev/null +++ b/ports/osg/fix-curl.patch @@ -0,0 +1,18 @@ +diff --git a/src/osgPlugins/curl/CMakeLists.txt b/src/osgPlugins/curl/CMakeLists.txt
+index cc459ff..370dbec 100644
+--- a/src/osgPlugins/curl/CMakeLists.txt
++++ b/src/osgPlugins/curl/CMakeLists.txt
+@@ -23,11 +23,11 @@ SET(TARGET_H
+
+ IF(ZLIB_FOUND)
+ SET(TARGET_LIBRARIES_VARS
+- CURL_LIBRARY
++ CURL_LIBRARIES
+ ZLIB_LIBRARIES)
+ ELSE()
+ SET(TARGET_LIBRARIES_VARS
+- CURL_LIBRARY)
++ CURL_LIBRARIES)
+ ENDIF()
+
+ IF(WIN32 OR MINGW)
diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch new file mode 100644 index 000000000..4745f8b41 --- /dev/null +++ b/ports/osg/fix-example-application.patch @@ -0,0 +1,34 @@ +diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt +index df859d0..123313a 100644 +--- a/applications/present3D/CMakeLists.txt ++++ b/applications/present3D/CMakeLists.txt +@@ -103,6 +103,11 @@ ENDIF() + IF (WIN32) + # to support cluster code + SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) ++ ++ find_package(EXPAT REQUIRED) ++ find_package(unofficial-iconv CONFIG REQUIRED) ++ ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT unofficial::iconv::libiconv unofficial::iconv::libcharset) + ELSE() + CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) + IF(LIB_NSL_HAS_GETHOSTBYNAME) +diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt +index 071ab26..bf8d85f 100644 +--- a/examples/osgstaticviewer/CMakeLists.txt ++++ b/examples/osgstaticviewer/CMakeLists.txt +@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) + SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype) + ENDIF(FREETYPE_FOUND) + ++IF (WIN32) ++ find_package(EXPAT REQUIRED) ++ find_package(unofficial-iconv CONFIG REQUIRED) ++ ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT unofficial::iconv::libiconv unofficial::iconv::libcharset) ++ENDIF() ++ + SET(TARGET_SRC osgstaticviewer.cpp ) + #### end var setup ### + SETUP_EXAMPLE(osgstaticviewer) diff --git a/ports/osg/fix-sdl.patch b/ports/osg/fix-sdl.patch new file mode 100644 index 000000000..fa092c784 --- /dev/null +++ b/ports/osg/fix-sdl.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 81328ea..2566b48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -755,8 +755,6 @@ ELSE() + FIND_PACKAGE(GStreamer COMPONENTS app pbutils) + FIND_PACKAGE(GLIB COMPONENTS gobject) + FIND_PACKAGE(DirectShow) +- FIND_PACKAGE(SDL2) +- FIND_PACKAGE(SDL) + FIND_PACKAGE(Poppler-glib) + FIND_PACKAGE(RSVG) + FIND_PACKAGE(GtkGl) +@@ -775,6 +773,11 @@ ELSE() + FIND_PACKAGE(Lua51) + ENDIF() + ENDIF() ++ ++ find_package(SDL) ++ if (NOT SDL_FOUND) ++ find_package(SDL2) ++ endif() + + # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this. + # FIND_PACKAGE(V8) +diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp +index 9de15b1..ae96e11 100644 +--- a/examples/osgmovie/osgmovie.cpp ++++ b/examples/osgmovie/osgmovie.cpp +@@ -691,7 +691,7 @@ int main(int argc, char** argv) + + #if USE_SDL || USE_SDL2 + +-#include "SDL.h" ++#include <SDL/SDL.h> + + static void soundReadCallback(void * user_data, uint8_t * data, int datalen) + { diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 03520aa9b..a4e3d7b73 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -1,15 +1,19 @@ -include(vcpkg_common_functions) - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(OSG_VER 3.6.4) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openscenegraph/OpenSceneGraph - REF OpenSceneGraph-3.6.4 + REF OpenSceneGraph-${OSG_VER} SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19 HEAD_REF master PATCHES collada.patch + static.patch + fix-sdl.patch + fix-example-application.patch + disable-present3d-staticview-in-linux.patch #Due to some link error we cannot solve yet, disable them in linux. + fix-curl.patch + remove-prefix.patch # Remove this patch when cmake fix Findosg_functions.cmake ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -17,8 +21,16 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") else() set(OSG_DYNAMIC ON) endif() + file(REMOVE ${SOURCE_PATH}/CMakeModules/FindSDL2.cmake) +set(OSG_USE_UTF8_FILENAME ON) +if (NOT VCPKG_TARGET_IS_WINDOWS) + message("Build osg requires gcc with version higher than 4.7.") + # Enable OSG_USE_UTF8_FILENAME will call some windows-only functions. + set(OSG_USE_UTF8_FILENAME OFF) +endif() + set(OPTIONS) if(NOT "collada" IN_LIST FEATURES) list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=ON) @@ -33,33 +45,44 @@ list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=ON) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DOSG_USE_UTF8_FILENAME=ON + -DOSG_USE_UTF8_FILENAME=${OSG_USE_UTF8_FILENAME} + -DDYNAMIC_OPENSCENEGRAPH=${OSG_DYNAMIC} + -DDYNAMIC_OPENTHREADS=${OSG_DYNAMIC} + -DBUILD_OSG_PLUGINS=ON # it should always be ON due to osgerath need this + -DBUILD_OSG_EXAMPLES=ON + -DBUILD_OSG_APPLICATIONS=ON + -DCMAKE_CXX_STANDARD=11 ) vcpkg_install_cmake() +vcpkg_copy_pdbs() + # handle osg tools and plugins file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -set(OSG_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/osg) +set(OSG_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(MAKE_DIRECTORY ${OSG_TOOL_PATH}) -file(GLOB OSG_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) +file(GLOB OSG_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) file(COPY ${OSG_TOOLS} DESTINATION ${OSG_TOOL_PATH}) file(REMOVE_RECURSE ${OSG_TOOLS}) -file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) file(REMOVE_RECURSE ${OSG_TOOLS_DBG}) -file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.4/*.dll) -file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/osg/osgPlugins-3.6.4) -file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.4/*.dll) -file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.6.4) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.4/) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.4/) +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/osgPlugins-${OSG_VER}) + file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-${OSG_VER}) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/ ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/) +endif() -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/osg) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/osg/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/osg/copyright) +file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/osgPlugins-${OSG_VER}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) +file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/osgPlugins-${OSG_VER}) +file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/lib/osgPlugins-${OSG_VER}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) +file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-${OSG_VER}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/osgPlugins-${OSG_VER}/ ${CURRENT_PACKAGES_DIR}/debug/lib/osgPlugins-${OSG_VER}/) #Cleanup file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) @@ -67,4 +90,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif()
\ No newline at end of file +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/ports/osg/remove-prefix.patch b/ports/osg/remove-prefix.patch new file mode 100644 index 000000000..62b1466c9 --- /dev/null +++ b/ports/osg/remove-prefix.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake +index bb3be63..356edcd 100644 +--- a/CMakeModules/ModuleInstall.cmake ++++ b/CMakeModules/ModuleInstall.cmake +@@ -21,7 +21,7 @@ SOURCE_GROUP( + FILES ${TARGET_H} + ) + +-IF(MSVC AND OSG_MSVC_VERSIONED_DLL) ++IF(0) + HANDLE_MSVC_DLL() + ENDIF() + +@@ -33,7 +33,7 @@ INSTALL( + ) + + IF(MSVC AND DYNAMIC_OPENSCENEGRAPH) +- GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX) ++ set(PREFIX "") + INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS RelWithDebInfo) + INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS Debug) + ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH) +diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt +index 84550bd..0e816f7 100644 +--- a/src/OpenThreads/win32/CMakeLists.txt ++++ b/src/OpenThreads/win32/CMakeLists.txt +@@ -39,7 +39,7 @@ LINK_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ) + +-IF(MSVC AND OSG_MSVC_VERSIONED_DLL) ++IF(0) + HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION}) + ENDIF() + diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 9475fa417..2e9f532b1 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,5 +1,5 @@ Source: pcl -Version: 1.9.1-10 +Version: 1.9.1-11 Homepage: https://github.com/PointCloudLibrary/pcl Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio @@ -14,7 +14,7 @@ Build-Depends: vtk[qt] Feature: pcap Description: PCAP support for PCL -Build-Depends: winpcap +Build-Depends: winpcap (windows), libpcap (!windows) Feature: tools Description: Build PCL utilities diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL index 4b4cac6b2..e37a8c9b2 100644 --- a/ports/pmdk/CONTROL +++ b/ports/pmdk/CONTROL @@ -1,5 +1,5 @@ Source: pmdk -Version: 1.7-1 +Version: 1.8 Homepage: https://github.com/pmem/pmdk Description: Persistent Memory Development Kit Supports: !(arm|x86)
\ No newline at end of file diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake index e8f1c309e..4445749c4 100644 --- a/ports/pmdk/portfile.cmake +++ b/ports/pmdk/portfile.cmake @@ -2,13 +2,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_fail_port_install(ON_ARCH "arm" "x86") -set(PMDK_VERSION "1.7") +set(PMDK_VERSION "1.8") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pmem/pmdk - REF bc5e309485df61c452d08367e4b13ba9dfed5071 #Commit id corresponding to the version 1.7 - SHA512 15bee6a046746e4ab7e827bb36685bc5d9cdffdbc68ba86eb71e2c4bd84eb4fed4586c09174257bfd87ea178c8ee9865a8824842d7d1df67e0ae79ff80cf650e + REF 0245d75eaf0f6106c86a7926a45fdf2149e37eaa #Commit id corresponding to the version 1.8 + SHA512 1628f1f6be9e70c28ed490cec2db27aa31a9c6d43e11755a4232686a8523df6dff768e75e64479e22aca52d72500e3a75b256e4ae4de1f518f33cc07c5c26d9b HEAD_REF master PATCHES remove-non-ascii-character.patch @@ -17,7 +17,7 @@ vcpkg_from_github( # Build only the selected projects vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/src/PMDK.sln - TARGET "Solution Items\\libpmem,Solution Items\\libpmemlog,Solution Items\\libpmemblk,Solution Items\\libpmemobj,Solution Items\\libpmempool,Solution Items\\libvmem,Solution Items\\Tools\\pmempool" + TARGET "Solution Items\\libpmem,Solution Items\\libpmemlog,Solution Items\\libpmemblk,Solution Items\\libpmemobj,Solution Items\\libpmempool,Solution Items\\Tools\\pmempool" OPTIONS /p:SRCVERSION=${PMDK_VERSION} ) diff --git a/ports/polymorphic-value/001_no_catch_submodule.patch b/ports/polymorphic-value/001_no_catch_submodule.patch new file mode 100644 index 000000000..8fec58a76 --- /dev/null +++ b/ports/polymorphic-value/001_no_catch_submodule.patch @@ -0,0 +1,33 @@ +diff --git C:/Users/Charles Barto/Source/vcpkg/buildtrees/polymorphic-value/src/1.3.0-33dc249788/CMakeLists.txt C:/Users/Charles Barto/patched_list.txt +index 2819bf6a4..0ee5fba76 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,9 +9,9 @@ set(POLYMOPHIC_VALUE_VERSION "1.3.0") # Revision 3, see paper p0201r3 + project(polymorphic_value VERSION ${POLYMOPHIC_VALUE_VERSION}) + + option(ENABLE_SANITIZERS "Enable Address Sanitizer and Undefined Behaviour Sanitizer if available" OFF) +- ++if(BUILD_TESTING) + add_subdirectory(externals/catch) +- ++endif() + add_library(polymorphic_value INTERFACE) + target_include_directories(polymorphic_value + INTERFACE +@@ -45,6 +45,7 @@ target_compile_features(polymorphic_value + add_library(polymorphic_value::polymorphic_value ALIAS polymorphic_value) + + if(POLYMORPHIC_IS_NOT_SUBPROJECT) ++ if(BUILD_TESTING) + add_executable(test_polymorphic_value test_polymorphic_value.cpp) + target_link_libraries(test_polymorphic_value + PRIVATE +@@ -107,7 +108,7 @@ if(POLYMORPHIC_IS_NOT_SUBPROJECT) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/externals/catch/contrib) + include(Catch) + catch_discover_tests(test_polymorphic_value) +- ++ endif() + install( + FILES + "${CMAKE_CURRENT_SOURCE_DIR}/polymorphic_value.h" diff --git a/ports/polymorphic-value/002_fixed_config.patch b/ports/polymorphic-value/002_fixed_config.patch new file mode 100644 index 000000000..77a99b058 --- /dev/null +++ b/ports/polymorphic-value/002_fixed_config.patch @@ -0,0 +1,14 @@ +diff --git a/./broken_config.cmake.in b/./fixed_config.cmake.in +index e64f8a20f..38c441451 100644 +--- a/polymorphic_value-config.cmake.in ++++ b/polymorphic_value-config.cmake.in +@@ -1,5 +1,7 @@ + @PACKAGE_INIT@ + +-set_and_check(POLYMORPHIC_VALUE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") + +-check_required_components(Foo) ++ ++check_required_components(polymorphic_value) ++ ++include(${CMAKE_CURRENT_LIST_DIR}/polymorphic_value-target.cmake) diff --git a/ports/polymorphic-value/CONTROL b/ports/polymorphic-value/CONTROL new file mode 100644 index 000000000..1016ead69 --- /dev/null +++ b/ports/polymorphic-value/CONTROL @@ -0,0 +1,4 @@ +Source: polymorphic-value
+Version: 1.3.0-1
+Description: A polymorphic value-type for C++
+Homepage: https://github.com/jbcoe/polymorphic_value
diff --git a/ports/polymorphic-value/portfile.cmake b/ports/polymorphic-value/portfile.cmake new file mode 100644 index 000000000..5a03c827b --- /dev/null +++ b/ports/polymorphic-value/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO jbcoe/polymorphic_value
+ REF 1.3.0
+ SHA512 67d49933c46d2a2bccb68c65c6f28b92603e193c68ff434b2c6b1602a573855a176fc98227d85cd24a64ae9299461adb42e792b4f165482bb250488620161742
+ HEAD_REF master
+ PATCHES 001_no_catch_submodule.patch
+ 002_fixed_config.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+if(VCPKG_HEAD_VERSION)
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/polymorphic_value TARGET_PATH share/polymorphic_value)
+ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+else()
+ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/polymorphic_value)
+ file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE.txt")
+endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(
+ INSTALL ${SOURCE_PATH}/LICENSE.txt
+ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+ RENAME copyright
+)
+
diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index 298010928..c003eec35 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,5 +1,5 @@ Source: proj4 -Version: 6.3.0-1 +Version: 6.3.1 Homepage: https://github.com/OSGeo/PROJ Description: PROJ.4 library for cartographic projections Build-Depends: sqlite3[core] diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 05ef8f8e3..cdb55c059 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ - REF 6.3.0 - SHA512 603256c27fb73b82e9af245ad09b46e6bc6e1934cb6375bf476f8b63177e933fb210b932b6890c425722c509189a0323755e311466f226d64694013c6c4a52de + REF 6.3.1 + SHA512 ec5a2b61b12d3d3ec2456b9e742cf7be98767889c4759334e60276f609054fa8eb59f13f07af38e69e9ee7b6f2b9542e2d5d7806726ce5616062af4de626c6fa HEAD_REF master PATCHES fix-sqlite3-bin.patch @@ -22,22 +22,19 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS database BUILD_PROJ_DATABASE ) - if ("database" IN_LIST FEATURES) if (VCPKG_TARGET_IS_WINDOWS) set(BIN_SUFFIX .exe) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3.exe) - message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x86-windows first.") - endif() + if (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3.exe) set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools) - elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)) - if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/sqlite3.exe) - message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x64-windows first.") - endif() + elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/sqlite3.exe) + set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools) + elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/sqlite3.exe AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")) set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows/tools) + elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/sqlite3.exe AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")) + set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools) else() - set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/tools) + message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x86-windows first.") endif() else() set(BIN_SUFFIX) diff --git a/ports/prometheus-cpp/CONTROL b/ports/prometheus-cpp/CONTROL index 290038bd0..99b84715c 100644 --- a/ports/prometheus-cpp/CONTROL +++ b/ports/prometheus-cpp/CONTROL @@ -1,5 +1,5 @@ Source: prometheus-cpp -Version: 0.8.0 +Version: 0.9.0 Description: Prometheus Client Library for Modern C++ Default-Features: compression, pull diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake index add7064cc..c6048af18 100644 --- a/ports/prometheus-cpp/portfile.cmake +++ b/ports/prometheus-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jupp0r/prometheus-cpp - REF v0.8.0 - SHA512 23cb0de4022f6a05e58aff37f36a499d062849c34772994fc69887a72462591553c7098492f18a8a86b5c31e70a0b93813a7cb7e5adb1974897e9f38053f543a + REF v0.9.0 + SHA512 d9d5fbbd8c8aad5dd6a5e872275324d689a0c57199e4158d74e13ea62b286fa71dee01bb4197b906b79792bf1ca4e67a46b5c04621d7070241ac32876f6de891 HEAD_REF master ) diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index 3e791759b..154d17954 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,4 +1,4 @@ Source: pugixml -Version: 1.10 +Version: 1.10-1 Homepage: https://github.com/zeux/pugixml Description: C++ XML processing library diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index e1ce0976d..f037e674a 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS -DUSE_POSTFIX=ON ) vcpkg_install_cmake() diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index ac926522b..090d35799 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base -Version: 5.12.5-8 +Version: 5.12.5-10 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 443d462e1..7a1f35ef8 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -340,4 +340,4 @@ if(QT_BUILD_LATEST) DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5 ) -endif() +endif()
\ No newline at end of file diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index bfa94474c..d77faa268 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools
-Version: 5.12.5-3
+Version: 5.12.5-4
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-base, qt5-declarative, qt5-activeqt (windows)
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index fdbfa8d8e..dcb121634 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -1,5 +1,7 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) + qt_submodule_installation() + if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") endif()
\ No newline at end of file diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index 44dea2ac2..c94c3ac3d 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 @@ -26,5 +24,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index a9a8a2fee..5b4231eae 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,4 +1,4 @@ Source: re2 -Version: 2019-09-01 +Version: 2020-01-01 Homepage: https://github.com/google/re2 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index 0b1ba3536..1963a6e6d 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/re2
- REF 2019-09-01
- SHA512 df446a7a00f3e8cd3f09c746ad41a6f58af3da88ab31cf8e2498d26e240bbe1f557f462fb6b10a818c3e00e02ec19dc60ce29eb6c4d61781aeb9b96b4c4e5af9
+ REF 2020-01-01
+ SHA512 ca9c5e3b63b55074ad1d74b73bcf115ae285b3b8989bb56de0bccdfd7b423df742cfd1d1b6eb963da6dc550b81f492eaef9a9c582e354906b8dd1b92fb451ed0
HEAD_REF master
)
diff --git a/ports/restinio/CONTROL b/ports/restinio/CONTROL index 0b9ced469..f4f56fb90 100644 --- a/ports/restinio/CONTROL +++ b/ports/restinio/CONTROL @@ -1,5 +1,5 @@ Source: restinio -Version: 0.6.4 +Version: 0.6.5 Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests. Build-Depends: asio, fmt, http-parser Homepage: https://github.com/stiffstream/restinio diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 416993893..50c1eb710 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stiffstream/restinio
- REF 1b6fdc114991ccc726b1b90153eee535106a6367 # v.0.6.4
- SHA512 68a735502f8f10e20e6caa5ed918166dc8448e5a0dfa3c6ee0cf3d43768ef7a27ffbfbe46c440dce9b846e5e6762818a9614c2d48aa67dbc03adb1854b28928b
+ REF 6934bd5a8ad707eb6a04894ec3bb198a39f447d9 # v.0.6.5
+ SHA512 5a0228a7a0940f38429cd63368ee3dee72ff2bc9a019bb7b3c9e59314a8fd7afee555f10f9ec375dc7dda412bc6922f7f561fc54b6cf2b783b7db3dda0c2ae6b
)
vcpkg_configure_cmake(
diff --git a/ports/rxspencer/CONTROL b/ports/rxspencer/CONTROL new file mode 100644 index 000000000..c310d2c89 --- /dev/null +++ b/ports/rxspencer/CONTROL @@ -0,0 +1,4 @@ +Source: rxspencer
+Version: 2020-01-12
+Homepage: https://garyhouston.github.io/regex/
+Description: Henry Spencer's BSD regular expression library.
diff --git a/ports/rxspencer/portfile.cmake b/ports/rxspencer/portfile.cmake new file mode 100644 index 000000000..fea3e68cb --- /dev/null +++ b/ports/rxspencer/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO garyhouston/rxspencer + REF e42b6a667f1385aedf49b533b9fbba58e5a26934 + SHA512 2842e1c78c3ebbbd03d15fb85e55f861740bb446aa57157f3fc90876d931d9f865242f5eaefc94f31c8d78e0d531a008d4c579e9b4f9c7179f5c7a95a98359fd + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DCMAKE_CONFIG_DEST=share/rxspencer +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "share/rxspencer") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/regex) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/ryu/CONTROL b/ports/ryu/CONTROL new file mode 100644 index 000000000..62e6e9f82 --- /dev/null +++ b/ports/ryu/CONTROL @@ -0,0 +1,4 @@ +Source: ryu +Version: 2.0 +Homepage: https://github.com/ulfjack/ryu +Description: Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety. diff --git a/ports/ryu/portfile.cmake b/ports/ryu/portfile.cmake new file mode 100644 index 000000000..17d1357da --- /dev/null +++ b/ports/ryu/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ulfjack/ryu + REF v2.0 + SHA512 88a0cca74a4889e8e579987abdc75a6ac87c1cdae557e5a15c29dbfd65733f9e591d6569e97a9374444918475099087f8056e696a97c9be24e38eb737e2304c2 + HEAD_REF master +) + +vcpkg_find_acquire_program(BAZEL) +get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) +vcpkg_add_to_path(PREPEND ${BAZEL_DIR}) +set(ENV{BAZEL_BIN_PATH} "${BAZEL}") + +if (CMAKE_HOST_WIN32) + set(ENV{BAZEL_VS} $ENV{VSInstallDir}) + set(ENV{BAZEL_VC} $ENV{VCInstallDir}) +endif () + +vcpkg_execute_build_process( + COMMAND ${BAZEL} build --verbose_failures //ryu + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-rel + ) + +if (CMAKE_HOST_WIN32) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +else() + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE-Boost DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/ryu/ryu.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + diff --git a/ports/ryu/ryuConfig.cmake b/ports/ryu/ryuConfig.cmake new file mode 100644 index 000000000..ae5e08cb2 --- /dev/null +++ b/ports/ryu/ryuConfig.cmake @@ -0,0 +1,20 @@ +function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + set(${NAMESPACE}_${LIB_NAME}_FOUND 1) +endfunction() + +get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) + +if (CMAKE_HOST_WIN32) +set_library_target("RYU" "ryu" "${ROOT}/debug/lib/ryu.lib" "${ROOT}/lib/ryu.lib" "${ROOT}/include/") +else() +set_library_target("RYU" "ryu" "${ROOT}/debug/lib/libryu.a" "${ROOT}/lib/libryu.a" "${ROOT}/include/") +endif()
\ No newline at end of file diff --git a/ports/sciter/0001_patch_stdafx.patch b/ports/sciter/0001_patch_stdafx.patch deleted file mode 100644 index b4a85d5d3..000000000 --- a/ports/sciter/0001_patch_stdafx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/sciter-win-main.cpp b/include/sciter-win-main.cpp -index 9f2699e..104b70a 100644 ---- a/include/sciter-win-main.cpp -+++ b/include/sciter-win-main.cpp -@@ -1,4 +1,6 @@ --#include "stdafx.h" -+// It is better to disable stdafx.h by default. -+// And enable it explicitly via /Fstdafx.h compiler option (C/C++ - Advanced - Force Include File). -+// #include "stdafx.h" - - #include <vector> - diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL index b835b87e1..a760561e9 100644 --- a/ports/sciter/CONTROL +++ b/ports/sciter/CONTROL @@ -1,5 +1,5 @@ Source: sciter
-Version: 4.2.6.9-2
+Version: 4.4.0.7
Homepage: https://github.com/c-smile/sciter-sdk
Description: Sciter is an embeddable HTML/CSS/scripting engine.
Supports: !uwp
\ No newline at end of file diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index 05fb42408..f148d4148 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -9,22 +9,22 @@ endif() # header-only library set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION c926703b2cce972875e7f6379c525eef66c95986) -set(SCITER_SHA 9a87ce12db9b2ef1e3abce3e475a9413a8a9301bab3d17341c94d4281e3bf616347ba8a4089f756ec38fed311bb4ee9045c8f85d0c40039ed3c0b96413aceeb4) +set(SCITER_REVISION 507dce1bed69d6ef7a0d5c7628cb7eb8680e0438) +set(SCITER_SHA 24ccc7d09247ea84a5a3e3c479dc6eb99b4115a89fec8e766874f706addee163b327f5380632b554b02074423f97097f993f8d361d8948800f6477de2b4ab5b5) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(SCITER_ARCH 64) + set(SCITER_ARCH x64) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(SCITER_ARCH 32) + set(SCITER_ARCH x32) endif() +# check out the `https://github.com/c-smile/sciter-sdk/archive/${SCITER_REVISION}.tar.gz` +# hash checksum can be obtained with `curl -L -o tmp.tgz ${URL} && vcpkg hash tmp.tgz` vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-smile/sciter-sdk REF ${SCITER_REVISION} SHA512 ${SCITER_SHA} - PATCHES - 0001_patch_stdafx.patch ) # install include directory @@ -51,9 +51,11 @@ file(COPY ${SOURCE_PATH}/widgets DESTINATION ${SCITER_SHARE}) # tools if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux AND VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(SCITER_BIN ${SOURCE_PATH}/bin.gtk/x64) + set(SCITER_BIN ${SOURCE_PATH}/bin.lnx/x64) + + file(INSTALL ${SOURCE_PATH}/bin.lnx/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SOURCE_PATH}/bin.lnx/tiscript DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - file(INSTALL ${SCITER_BIN}/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) file(INSTALL ${SCITER_BIN}/usciter DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) file(INSTALL ${SCITER_BIN}/inspector DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${SCITER_TOOLS}) @@ -65,6 +67,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) set(SCITER_BIN ${SOURCE_PATH}/bin.osx) file(INSTALL ${SCITER_BIN}/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/tiscript DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/inspector.app DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/sciter.app DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/sciter-osx-64.dylib DESTINATION ${SCITER_TOOLS}) @@ -73,14 +77,15 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) file(INSTALL ${SCITER_BIN}/sciter-osx-64.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) else() - set(SCITER_BIN ${SOURCE_PATH}/bin/${SCITER_ARCH}) + set(SCITER_BIN ${SOURCE_PATH}/bin.win/${SCITER_ARCH}) + set(SCITER_BIN32 ${SOURCE_PATH}/bin.win/x32) - file(INSTALL ${SOURCE_PATH}/bin/packfolder.exe DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SOURCE_PATH}/bin/tiscript.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SOURCE_PATH}/bin.win/packfolder.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SOURCE_PATH}/bin.win/tiscript.exe DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter.exe DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/inspector.exe DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN32}/wsciter.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN32}/inspector.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN32}/sciter.dll DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL index 808fef451..a313ab982 100644 --- a/ports/sdl1/CONTROL +++ b/ports/sdl1/CONTROL @@ -1,3 +1,4 @@ Source: sdl1 -Version: 1.2.15-9 +Version: 1.2.15-10 +Homepage: https://www.libsdl.org Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index 5344df168..999b616e6 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -16,11 +16,11 @@ if (VCPKG_TARGET_IS_WINDOWS) file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/SDL_static.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDL RENAME SDL.vcxproj) - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/SDLmain_static.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDLmain RENAME SDLmain.vcxproj) + configure_file(${CMAKE_CURRENT_LIST_DIR}/SDL_static.vcxproj ${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj COPYONLY) + configure_file(${CMAKE_CURRENT_LIST_DIR}/SDLmain_static.vcxproj ${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj COPYONLY) else() - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/SDL_dynamic.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDL RENAME SDL.vcxproj) - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/SDLmain_dynamic.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDLmain RENAME SDLmain.vcxproj) + configure_file(${CMAKE_CURRENT_LIST_DIR}/SDL_dynamic.vcxproj ${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj COPYONLY) + configure_file(${CMAKE_CURRENT_LIST_DIR}/SDLmain_dynamic.vcxproj ${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj COPYONLY) endif() # This text file gets copied as a library, and included as one in the package diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index 57c840ea1..b5b5eac61 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -91,10 +91,16 @@ add_library(SDL2_mixer music_wav.c version.rc) -if(WIN32) +if(WIN32 OR APPLE) list(APPEND SDL_MIXER_DEFINES MUSIC_MID_NATIVE) - target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c native_midi/native_midi_win32.c) - target_link_libraries(SDL2_mixer ${SDL_MIXER_LIBRARIES} Winmm) + target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c) + target_link_libraries(SDL2_mixer ${SDL_MIXER_LIBRARIES}) + if(WIN32) + target_sources(SDL2_mixer PRIVATE native_midi/native_midi_win32.c) + target_link_libraries(SDL2_mixer Winmm) + elseif(APPLE) + target_sources(SDL2_mixer PRIVATE native_midi/native_midi_macosx.c) + endif() endif() set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL index c3c60d942..4ea51192e 100644 --- a/ports/sdl2-mixer/CONTROL +++ b/ports/sdl2-mixer/CONTROL @@ -1,5 +1,5 @@ Source: sdl2-mixer -Version: 2.0.4-8 +Version: 2.0.4-9 Homepage: https://www.libsdl.org/projects/SDL_mixer Description: Multi-channel audio mixer library for SDL. Build-Depends: sdl2 diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL index 3f96bc71f..771584a8f 100644 --- a/ports/sdl2/CONTROL +++ b/ports/sdl2/CONTROL @@ -1,5 +1,5 @@ Source: sdl2 -Version: 2.0.10-2 +Version: 2.0.10-3 Homepage: https://github.com/SDL-Mirror/SDL Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. diff --git a/ports/sdl2/enable-winrt-cmake.patch b/ports/sdl2/enable-winrt-cmake.patch index 836ffcdd7..03deb415c 100644 --- a/ports/sdl2/enable-winrt-cmake.patch +++ b/ports/sdl2/enable-winrt-cmake.patch @@ -135,7 +135,7 @@ index 0128c7a..bd534e4 100644 # Always build SDLmain
+if(NOT WINDOWS_STORE)
add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
- target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
+ target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/SDL2>)
set(_INSTALL_LIBS "SDL2main")
if (NOT ANDROID)
set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
diff --git a/ports/sdl2/fix-cmake-include-dir.patch b/ports/sdl2/fix-cmake-include-dir.patch new file mode 100644 index 000000000..11f70acc8 --- /dev/null +++ b/ports/sdl2/fix-cmake-include-dir.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd59d89b2..85ebe5f7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1789,7 +1789,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+
+ # Always build SDLmain
+ add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
+-target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
++target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/SDL2>)
+ set(_INSTALL_LIBS "SDL2main")
+ if (NOT ANDROID)
+ set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
+@@ -1820,7 +1820,7 @@ if(SDL_SHARED)
+ endif()
+ set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS})
+ target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
+- target_include_directories(SDL2 PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
++ target_include_directories(SDL2 PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/SDL2>)
+ if (NOT ANDROID)
+ set_target_properties(SDL2 PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
+ endif()
+@@ -1860,7 +1860,7 @@ if(SDL_STATIC)
+ # libraries - do we need to consider this?
+ set(_INSTALL_LIBS "SDL2-static" ${_INSTALL_LIBS})
+ target_link_libraries(SDL2-static ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
+- target_include_directories(SDL2-static PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
++ target_include_directories(SDL2-static PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/SDL2>)
+ if (NOT ANDROID)
+ set_target_properties(SDL2-static PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
+ endif()
diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 39ae73302..8c0a25c01 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SDL-Mirror/SDL @@ -8,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES export-symbols-only-in-shared-build.patch + fix-cmake-include-dir.patch enable-winrt-cmake.patch fix-arm64-headers.patch disable-hidapi-for-uwp.patch @@ -18,18 +17,16 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SDL_SHARED) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) -set(VULKAN_VIDEO OFF) -if("vulkan" IN_LIST FEATURES) - set(VULKAN_VIDEO ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + vulkan VIDEO_VULKAN +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -DSDL_STATIC=${SDL_STATIC} -DSDL_SHARED=${SDL_SHARED} - -DVIDEO_VULKAN=${VULKAN_VIDEO} -DFORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} -DLIBC=ON ) diff --git a/ports/shogun/CONTROL b/ports/shogun/CONTROL index b9f99fbb0..5f46ded2a 100644 --- a/ports/shogun/CONTROL +++ b/ports/shogun/CONTROL @@ -1,4 +1,5 @@ Source: shogun -Version: 6.1.4 +Version: 6.1.4-1 Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64&!osx), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent -Description: Unified and efficient Machine Learning +Homepage: https://github.com/shogun-toolbox/shogun +Description: Unified and efficient Machine Learning
\ No newline at end of file diff --git a/ports/shogun/MSDirent.cmake b/ports/shogun/MSDirent.cmake deleted file mode 100644 index dd895f970..000000000 --- a/ports/shogun/MSDirent.cmake +++ /dev/null @@ -1 +0,0 @@ -find_path(MSDIRENT_INCLUDE_DIR NAMES dirent.h)
diff --git a/ports/shogun/cmake-config.in.patch b/ports/shogun/cmake-config.in.patch new file mode 100644 index 000000000..8ee2a1343 --- /dev/null +++ b/ports/shogun/cmake-config.in.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/ShogunConfig.cmake.in b/cmake/ShogunConfig.cmake.in
+index e8e8035..a5097cb 100644
+--- a/cmake/ShogunConfig.cmake.in
++++ b/cmake/ShogunConfig.cmake.in
+@@ -2,5 +2,5 @@
+
+ set_and_check(shogun_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+
+-include("@PACKAGE_CONFIG_PACKAGE_DIR@/ShogunTargets.cmake")
++include("@PACKAGE_CONFIG_PACKAGE_DIR@/../../../share/shogun/ShogunTargets.cmake")
+ check_required_components(shogun)
diff --git a/ports/shogun/fix-dirent.patch b/ports/shogun/fix-dirent.patch new file mode 100644 index 000000000..f45102356 --- /dev/null +++ b/ports/shogun/fix-dirent.patch @@ -0,0 +1,17 @@ +diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt
+index fd76961..396251c 100644
+--- a/src/shogun/CMakeLists.txt
++++ b/src/shogun/CMakeLists.txt
+@@ -170,10 +170,10 @@ IF(MSVC)
+ ENDIF()
+
+ # bundle dirent
+- include(external/MSDirent)
++ find_path(MSDIRENT_INCLUDE_DIR NAMES dirent.h)
+ SHOGUN_INCLUDE_DIRS(SCOPE PUBLIC
+ $<BUILD_INTERFACE:${MSDIRENT_INCLUDE_DIR}>
+- $<INSTALL_INTERFACE:include/shogun/lib/external/MSDirent>
++ $<INSTALL_INTERFACE:include>
+ )
+
+ target_link_libraries(shogun PUBLIC winmm)
diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake index d77ef5cf9..ce68bcb57 100644 --- a/ports/shogun/portfile.cmake +++ b/ports/shogun/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") @@ -16,12 +14,10 @@ vcpkg_from_github( HEAD_REF master PATCHES cmake.patch + cmake-config.in.patch + fix-dirent.patch ) -file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/external) -file(MAKE_DIRECTORY ${SOURCE_PATH}/cmake/external) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/MSDirent.cmake DESTINATION ${SOURCE_PATH}/cmake/external) - vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(${PYTHON3_DIR}) @@ -52,7 +48,6 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=${CMAKE_DISABLE_FIND_PACKAGE_BLAS} - -DINSTALL_TARGETS=shogun-static ) @@ -67,5 +62,4 @@ file(REMOVE_RECURSE ) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/shogun) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/shogun/COPYING ${CURRENT_PACKAGES_DIR}/share/shogun/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/ports/skia/CONTROL b/ports/skia/CONTROL new file mode 100644 index 000000000..ed2abe472 --- /dev/null +++ b/ports/skia/CONTROL @@ -0,0 +1,10 @@ +Source: skia +Version: 2020-02-15 +Homepage: https://skia.org +Description: Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms. + It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products. + Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source. +Supports: x64 & (osx | windows) + +Feature: metal +Description: metal support for skia diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake new file mode 100644 index 000000000..66b140d08 --- /dev/null +++ b/ports/skia/portfile.cmake @@ -0,0 +1,226 @@ +vcpkg_fail_port_install( + ON_ARCH "x86" "arm" "arm64" + ON_TARGET "UWP" "LINUX" "ANDROID" "FREEBSD") + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://skia.googlesource.com/skia.git + REF 05676f7bc238f667de848dfd37b4aa3c01b69efb +) + +find_program(GIT NAMES git git.cmd) +set(ENV{GIT_EXECUTABLE} "${GIT}") + +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + +vcpkg_find_acquire_program(NINJA) + +message(STATUS "Syncing git dependencies...") +vcpkg_execute_required_process( + COMMAND "${PYTHON2}" tools/git-sync-deps + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME sync-deps-${TARGET_TRIPLET} +) + +find_program(GN gn PATHS "${SOURCE_PATH}/bin" "${DEPOT_TOOLS_PATH}") + +set(OPTIONS "\ +skia_use_system_libjpeg_turbo=false \ +skia_use_system_libpng=false \ +skia_use_system_libwebp=false \ +skia_use_system_icu=false \ +skia_use_system_expat=false \ +skia_use_system_zlib=false") + +# used for passing feature-specific definitions to the config file +set(SKIA_PUBLIC_DEFINITIONS "") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(OPTIONS "${OPTIONS} is_component_build=true") +else() + set(OPTIONS "${OPTIONS} is_component_build=false") +endif() + +if("metal" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_metal=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_METAL) +endif() + +set(OPTIONS_REL "${OPTIONS} is_official_build=true") +set(OPTIONS_DBG "${OPTIONS} is_debug=true") + +function(find_msvc_path PATH) + vcpkg_get_program_files_32_bit(PROGRAM_FILES) + file(TO_CMAKE_PATH "${PROGRAM_FILES}" PROGRAM_FILES) + set(VSWHERE "${PROGRAM_FILES}/Microsoft Visual Studio/Installer/vswhere.exe") + execute_process( + COMMAND "${VSWHERE}" -prerelease -legacy -products * -sort -utf8 -property installationPath + WORKING_DIRECTORY "${SOURCE_PATH}" + OUTPUT_VARIABLE OUTPUT_ + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + string(REGEX REPLACE "\n|(\r\n)" ";" OUTPUT_ "${OUTPUT_}") + list(GET OUTPUT_ 0 OUTPUT_) + + set(${PATH} "${OUTPUT_}" PARENT_SCOPE) +endfunction() + +if(CMAKE_HOST_WIN32) + # Load toolchains + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + endif() + include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + + # turn a space delimited string into a gn list: + # "a b c" -> ["a","b","c"] + function(to_gn_list OUTPUT_ INPUT_) + string(STRIP "${INPUT_}" TEMP) + string(REPLACE " " " " TEMP "${TEMP}") + string(REPLACE " " "\",\"" TEMP "${TEMP}") + set(${OUTPUT_} "[\"${TEMP}\"]" PARENT_SCOPE) + endfunction() + + to_gn_list(SKIA_C_FLAGS_DBG "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}") + to_gn_list(SKIA_C_FLAGS_REL "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}") + + to_gn_list(SKIA_CXX_FLAGS_DBG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + to_gn_list(SKIA_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + + set(OPTIONS_DBG "${OPTIONS_DBG} extra_cflags_c=${SKIA_C_FLAGS_DBG} \ + extra_cflags_cc=${SKIA_CXX_FLAGS_DBG}") + + set(OPTIONS_REL "${OPTIONS_REL} extra_cflags_c=${SKIA_C_FLAGS_REL} \ + extra_cflags_cc=${SKIA_CXX_FLAGS_REL}") + + find_msvc_path(WIN_VC) + set(WIN_VC "${WIN_VC}\\VC") + set(OPTIONS_DBG "${OPTIONS_DBG} win_vc=\"${WIN_VC}\"") + set(OPTIONS_REL "${OPTIONS_REL} win_vc=\"${WIN_VC}\"") + +endif() + +set(BUILD_DIR_REL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") +set(BUILD_DIR_DBG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + +message(STATUS "Generating build (debug)...") +vcpkg_execute_required_process( + COMMAND "${GN}" gen "${BUILD_DIR_DBG}" --args=${OPTIONS_DBG} + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME generate-${TARGET_TRIPLET}-dbg +) + +message(STATUS "Generating build (release)...") +vcpkg_execute_required_process( + COMMAND "${GN}" gen "${BUILD_DIR_REL}" --args=${OPTIONS_REL} + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME generate-${TARGET_TRIPLET}-rel +) + +message(STATUS "Building Skia (debug)...") +vcpkg_execute_build_process( + COMMAND "${NINJA}" -C "${BUILD_DIR_DBG}" skia + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME build-${TARGET_TRIPLET}-dbg +) + +message(STATUS "Building Skia (release)...") +vcpkg_execute_build_process( + COMMAND "${NINJA}" -C "${BUILD_DIR_REL}" skia + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME build-${TARGET_TRIPLET}-rel +) + +message(STATUS "Installing: ${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(COPY "${SOURCE_PATH}/include" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/include" + "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(GLOB_RECURSE SKIA_INCLUDE_FILES LIST_DIRECTORIES false + "${CURRENT_PACKAGES_DIR}/include/${PORT}/*") +foreach(file_ ${SKIA_INCLUDE_FILES}) + vcpkg_replace_string("${file_}" "#include \"include/" "#include \"${PORT}/") +endforeach() + +# Finds and stores a single file that matches GLOBBING_EXPR +# into the OUT_VAR or fails otherwise +function(glob_single_file OUT_VAR GLOBBING_EXPR) + file(GLOB RESULTS LIST_DIRECTORIES false "${GLOBBING_EXPR}") + list(LENGTH RESULTS RESULTS_LENGTH) + if(NOT RESULTS_LENGTH EQUAL 1) + message(FATAL_ERROR "Expected one file to match glob: '${GLOBBING_EXPR}'; found: '${RESULTS}'") + endif() + list(GET RESULTS 0 FIRST_RESULT) + set(${OUT_VAR} "${FIRST_RESULT}" PARENT_SCOPE) +endfunction() + +if(VCPKG_TARGET_IS_WINDOWS) + glob_single_file(SKIA_LIBRARY_DBG "${BUILD_DIR_DBG}/skia*.lib") + file(INSTALL "${SKIA_LIBRARY_DBG}" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + glob_single_file(SKIA_LIBRARY_REL "${BUILD_DIR_REL}/skia*.lib") + file(INSTALL "${SKIA_LIBRARY_REL}" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + get_filename_component(SKIA_LIBRARY_IMPLIB_DBG + "${SKIA_LIBRARY_DBG}" NAME) + get_filename_component(SKIA_LIBRARY_IMPLIB_REL + "${SKIA_LIBRARY_REL}" NAME) + + glob_single_file(SKIA_LIBRARY_DBG "${BUILD_DIR_DBG}/skia*.dll") + file(INSTALL "${SKIA_LIBRARY_DBG}" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + get_filename_component(SKIA_LIBRARY_NAME_DBG "${SKIA_LIBRARY_DBG}" NAME) + + glob_single_file(SKIA_LIBRARY_DBG "${BUILD_DIR_DBG}/skia*.pdb") + file(INSTALL "${SKIA_LIBRARY_DBG}" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + + glob_single_file(SKIA_LIBRARY_REL "${BUILD_DIR_REL}/skia*.dll") + file(INSTALL "${SKIA_LIBRARY_REL}" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + get_filename_component(SKIA_LIBRARY_NAME_REL "${SKIA_LIBRARY_REL}" NAME) + else() + get_filename_component(SKIA_LIBRARY_NAME_DBG "${SKIA_LIBRARY_DBG}" NAME) + get_filename_component(SKIA_LIBRARY_NAME_REL "${SKIA_LIBRARY_REL}" NAME) + endif() +else() + find_library(SKIA_LIBRARY_DBG skia PATHS "${BUILD_DIR_DBG}" NO_DEFAULT_PATH) + file(INSTALL "${SKIA_LIBRARY_DBG}" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + find_library(SKIA_LIBRARY_REL skia PATHS "${BUILD_DIR_REL}" NO_DEFAULT_PATH) + file(INSTALL "${SKIA_LIBRARY_REL}" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + get_filename_component(SKIA_LIBRARY_NAME_DBG "${SKIA_LIBRARY_DBG}" NAME) + get_filename_component(SKIA_LIBRARY_NAME_REL "${SKIA_LIBRARY_REL}" NAME) +endif() + +# get a list of library dependencies for TARGET +function(gn_desc_target_libs SOURCE_PATH BUILD_DIR TARGET OUTPUT) + execute_process( + COMMAND ${GN} desc "${BUILD_DIR}" "${TARGET}" libs + WORKING_DIRECTORY "${SOURCE_PATH}" + OUTPUT_VARIABLE OUTPUT_ + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + string(REGEX REPLACE "\n|(\r\n)" ";" OUTPUT_ "${OUTPUT_}") + set(${OUTPUT} ${OUTPUT_} PARENT_SCOPE) +endfunction() + +# skiaConfig.cmake.in input variables +gn_desc_target_libs("${SOURCE_PATH}" "${BUILD_DIR_DBG}" //:skia SKIA_DEP_DBG) +gn_desc_target_libs("${SOURCE_PATH}" "${BUILD_DIR_REL}" //:skia SKIA_DEP_REL) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/skia/skiaConfig.cmake" @ONLY) + +vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/ports/skia/skiaConfig.cmake.in b/ports/skia/skiaConfig.cmake.in new file mode 100644 index 000000000..4a1d00877 --- /dev/null +++ b/ports/skia/skiaConfig.cmake.in @@ -0,0 +1,78 @@ +add_library(skia::skia SHARED IMPORTED) +set(SKIA_DEP_DBG @SKIA_DEP_DBG@) +set(SKIA_DEP_REL @SKIA_DEP_REL@) + +set(SKIA_LIBRARY_NAME_DBG @SKIA_LIBRARY_NAME_DBG@) +set(SKIA_LIBRARY_NAME_REL @SKIA_LIBRARY_NAME_REL@) +set(SKIA_LIBRARY_IMPLIB_DBG @SKIA_LIBRARY_IMPLIB_DBG@) +set(SKIA_LIBRARY_IMPLIB_REL @SKIA_LIBRARY_IMPLIB_REL@) + +set(SKIA_PUBLIC_DEFINITIONS @SKIA_PUBLIC_DEFINITIONS@) + +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +if(WIN32) + if(SKIA_LIBRARY_IMPLIB_DBG) + set_property(TARGET skia::skia PROPERTY + IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/${SKIA_LIBRARY_IMPLIB_DBG}" + ) + set_property(TARGET skia::skia PROPERTY + IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/debug/bin/${SKIA_LIBRARY_NAME_DBG}" + ) + else() + set_property(TARGET skia::skia PROPERTY + IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/${SKIA_LIBRARY_NAME_DBG}" + ) + endif() + + if(SKIA_LIBRARY_IMPLIB_REL) + set_property(TARGET skia::skia PROPERTY + IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${SKIA_LIBRARY_IMPLIB_REL}" + ) + set_property(TARGET skia::skia PROPERTY + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${SKIA_LIBRARY_NAME_REL}" + ) + else() + set_property(TARGET skia::skia PROPERTY + IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${SKIA_LIBRARY_NAME_REL}" + ) + endif() +else() + set_property(TARGET skia::skia PROPERTY + IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/debug/lib/${SKIA_LIBRARY_NAME_DBG}" + ) + set_property(TARGET skia::skia PROPERTY + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${SKIA_LIBRARY_NAME_REL}" + ) +endif() + +foreach(LIB ${SKIA_DEP_DBG}) + string(REGEX REPLACE "\\.framework" "" LIB ${LIB}) + string(REGEX REPLACE "[^a-zA-Z]" "_" LIB_NAME ${LIB}) + string(TOUPPER ${LIB_NAME} LIB_NAME) + set(LIB_NAME SKIA_${LIB_NAME}_LIBRARY) + find_library(${LIB_NAME} ${LIB}) + set_property(TARGET skia::skia + APPEND PROPERTY INTERFACE_LINK_LIBRARIES + "$<$<CONFIG:Debug>:${${LIB_NAME}}>") +endforeach() + +foreach(LIB ${SKIA_DEP_REL}) + string(REGEX REPLACE "\\.framework" "" LIB ${LIB}) + string(REGEX REPLACE "[^a-zA-Z]" "_" LIB_NAME ${LIB}) + string(TOUPPER ${LIB_NAME} LIB_NAME) + set(LIB_NAME SKIA_${LIB_NAME}_LIBRARY) + find_library(${LIB_NAME} ${LIB}) + set_property(TARGET skia::skia + APPEND PROPERTY INTERFACE_LINK_LIBRARIES + "$<$<CONFIG:Release>:${${LIB_NAME}}>") +endforeach() + +target_include_directories(skia::skia INTERFACE ${_IMPORT_PREFIX}/include) +target_compile_definitions(skia::skia INTERFACE ${SKIA_PUBLIC_DEFINITIONS}) diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 4c27da425..e7f91fc94 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,9 +1,9 @@ Source: spdlog -Version: 1.4.2 +Version: 1.4.2-1 Homepage: https://github.com/gabime/spdlog Description: Very fast, header only, C++ logging library Build-Depends: fmt Feature: benchmark Description: Use google benchmark -Build-Depends: benchmark
\ No newline at end of file +Build-Depends: benchmark diff --git a/ports/spdlog/fix-include.patch b/ports/spdlog/fix-include.patch new file mode 100644 index 000000000..7f5539201 --- /dev/null +++ b/ports/spdlog/fix-include.patch @@ -0,0 +1,12 @@ +diff --git a/include/spdlog/common.h b/include/spdlog/common.h +index e1108a0a..b4faf26e 100644 +--- a/include/spdlog/common.h ++++ b/include/spdlog/common.h +@@ -14,6 +14,7 @@ + #include <string> + #include <type_traits> + #include <functional> ++#include <cassert> + + #ifdef _WIN32 + #ifndef NOMINMAX diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 0bbad6d61..f62234090 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix-feature-export.patch fix-error-4275.patch fix-uwp.patch + fix-include.patch ) set(SPDLOG_USE_BENCHMARK OFF) diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL index 046612e1c..37384865e 100644 --- a/ports/sqlite3/CONTROL +++ b/ports/sqlite3/CONTROL @@ -1,5 +1,5 @@ Source: sqlite3 -Version: 3.30.1-2 +Version: 3.31.1 Homepage: https://sqlite.org/ Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index e46036667..7b14475e3 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,8 +1,8 @@ -set(SQLITE_VERSION 3300100)
-set(SQLITE_HASH 030b53fe684e0fb8e9747b1f160e5e875807eabb0763caff66fe949ee6aa92f26f409b9b25034d8d1f5cee554a99e56a2bb92129287b0fe0671409babe9d18ea )
+set(SQLITE_VERSION 3310100)
+set(SQLITE_HASH 3a44168a9973896d26880bc49469c3b9a120fd39dbeb27521c216b900fd32c5b3ca19ba51648e8c7715899b173cf01b4ae6e03a16cb3a7058b086147389437af )
vcpkg_download_distfile(ARCHIVE
- URLS "https://sqlite.org/2019/sqlite-amalgamation-${SQLITE_VERSION}.zip"
+ URLS "https://sqlite.org/2020/sqlite-amalgamation-${SQLITE_VERSION}.zip"
FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip"
SHA512 ${SQLITE_HASH}
)
diff --git a/ports/superlu/CONTROL b/ports/superlu/CONTROL new file mode 100644 index 000000000..69d67385c --- /dev/null +++ b/ports/superlu/CONTROL @@ -0,0 +1,5 @@ +Source: superlu +Version: 2020-01-07 +Build-Depends: openblas +Description: Supernodal sparse direct solver. +Homepage: https://github.com/xiaoyeli/superlu diff --git a/ports/superlu/fix-libm.patch b/ports/superlu/fix-libm.patch new file mode 100644 index 000000000..a356bbda2 --- /dev/null +++ b/ports/superlu/fix-libm.patch @@ -0,0 +1,17 @@ +diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +index e627f06..9aa8949 100644 +--- a/SRC/CMakeLists.txt ++++ b/SRC/CMakeLists.txt +@@ -232,7 +232,11 @@ if(enable_complex16) + endif() + + add_library(superlu ${sources} ${HEADERS}) +-target_link_libraries(superlu PUBLIC ${BLAS_LIB} m) ++if(CMAKE_SYSTEM_NAME STREQUAL "Windows") ++ target_link_libraries(superlu PUBLIC ${BLAS_LIB}) ++else() ++ target_link_libraries(superlu PUBLIC ${BLAS_LIB} m) ++endif() + target_include_directories(superlu PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<INSTALL_INTERFACE:include> diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake new file mode 100644 index 000000000..807981f5d --- /dev/null +++ b/ports/superlu/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiaoyeli/superlu + REF a3d5233770f0caad4bc4578b46d3b26af99e9c19 + SHA512 c07e64be51ddef7774a367e1309ef4e596e93571531ec58a0c7b9db60a3db8b3a4a8b1262d66fcd512ad467db5df59a3726db342b259e392a08f56f5dd67c6ef + HEAD_REF master + PATCHES + fix-libm.patch + remove-make.inc.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DXSDK_ENABLE_Fortran=OFF + -Denable_tests=OFF + -Denable_blaslib=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/superlu/remove-make.inc.patch b/ports/superlu/remove-make.inc.patch new file mode 100644 index 000000000..8f7716aad --- /dev/null +++ b/ports/superlu/remove-make.inc.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b414f5f..22f29ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,7 +155,6 @@ endif() + # file(WRITE "make.defs" "# can be exposed to users" + # ${CMAKE_C_COMPILER} ) + # configure_file(${CMAKE_SOURCE_DIR}/make.inc.in ${CMAKE_SOURCE_DIR}/make.inc) +-configure_file(${SuperLU_SOURCE_DIR}/make.inc.in ${SuperLU_SOURCE_DIR}/make.inc) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/superlu.pc.in ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc diff --git a/ports/tinyfiledialogs/CONTROL b/ports/tinyfiledialogs/CONTROL index 346c8f886..c4435bd77 100644 --- a/ports/tinyfiledialogs/CONTROL +++ b/ports/tinyfiledialogs/CONTROL @@ -1,4 +1,5 @@ Source: tinyfiledialogs -Version: 3.4.3 +Version: 3.4.3-1 Description: Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more Homepage: https://sourceforge.net/projects/tinyfiledialogs/ +Supports: !uwp diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index bc9dff033..5deecdc71 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -1,9 +1,17 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_git( +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceforge.net/projects/tinyfiledialogs/files/v3.4/tinyfiledialogs-3.4.3.zip/download" + FILENAME "tinyfiledialogs-3.4.3.zip" + SHA512 b4a8c8fa5ff53a0972ce9dd1a4a473eaeb82689e5a47553b83e9220ea7e0ec582d87111728088ab6d314972e6531653b11fbd8c05c5e46fbe5bc4d29c7fe23fb +) + +vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - URL https://git.code.sf.net/p/tinyfiledialogs/code - REF f7789c57db4269495a6702625351a15e5ee17542 + ARCHIVE ${ARCHIVE} + REF v3.4.3 ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/tmxparser/CONTROL b/ports/tmxparser/CONTROL index 44954e36e..52288b2db 100644 --- a/ports/tmxparser/CONTROL +++ b/ports/tmxparser/CONTROL @@ -1,4 +1,4 @@ Source: tmxparser
-Version: 2.1.0-3
+Version: 2.1.0-4
Description: C++11 library for parsing the maps generated by the Map Editor called Tiled.
Build-Depends: zlib, tinyxml2
diff --git a/ports/tmxparser/fix_include_paths.patch b/ports/tmxparser/fix_include_paths.patch new file mode 100644 index 000000000..fedcb43bc --- /dev/null +++ b/ports/tmxparser/fix_include_paths.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d06cb4..593bbfd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,8 @@ endif (NOT USE_MINIZ) + + set(EXAMPLE_CFLAGS "-std=c++11 -pedantic -Werror -Wall -g") + #include_directories("${PROJECT_SOURCE_DIR}/include") ++include_directories("${PROJECT_BINARY_DIR}") ++include_directories("${PROJECT_SOURCE_DIR}/src") + + add_library(tmxparser_static STATIC ${SOURCES} ${HEADERS}) + set_target_properties(tmxparser_static PROPERTIES +@@ -67,8 +69,6 @@ add_executable(run_tests test/test.cpp) + set_target_properties(run_tests PROPERTIES + COMPILE_FLAGS ${EXAMPLE_CFLAGS}) + target_link_libraries(run_tests tmxparser ${TINYXML2_LIBRARIES}) +-include_directories("${PROJECT_BINARY_DIR}") +-include_directories("${PROJECT_SOURCE_DIR}/src") + + install(FILES ${HEADERS} DESTINATION include/tmxparser) + install(TARGETS tmxparser tmxparser_static DESTINATION lib) diff --git a/ports/tmxparser/portfile.cmake b/ports/tmxparser/portfile.cmake index 024d14d09..1f1b9e286 100644 --- a/ports/tmxparser/portfile.cmake +++ b/ports/tmxparser/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v2.1.0
HEAD_REF master
SHA512 011cce3bb98057f8e2a0a82863fedb7c4b9e41324d5cfa6daade4d000c3f6c8c157da7b153f7f2564ecdefe8019fc8446c9b1b8a675be04329b04a0891ee1c27
+ PATCHES
+ fix_include_paths.patch
)
vcpkg_configure_cmake(
diff --git a/ports/toml11/CONTROL b/ports/toml11/CONTROL new file mode 100644 index 000000000..9ba3f67f7 --- /dev/null +++ b/ports/toml11/CONTROL @@ -0,0 +1,4 @@ +Source: toml11 +Version: 3.3.0 +Homepage: https://github.com/ToruNiina/toml11 +Description: A C++11 header-only toml parser/encoder depending only on C++ standard library. diff --git a/ports/toml11/portfile.cmake b/ports/toml11/portfile.cmake new file mode 100644 index 000000000..4f056759d --- /dev/null +++ b/ports/toml11/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ToruNiina/toml11 + REF v3.3.0 + SHA512 3de018972bd2d9da193ca3d4746f1a77a120d563dbfb0e8f72800a0b01e24fb95fe83e4bd1a93d4bc10b3a603e7e63dd9478079bd0a31692d8412cbcf4860c37 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/toml.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/toml DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL index 600baf27d..4d0473c72 100644 --- a/ports/tool-meson/CONTROL +++ b/ports/tool-meson/CONTROL @@ -1,3 +1,3 @@ Source: tool-meson -Version: 0.52.0 +Version: 0.53.2 Description: Meson build system diff --git a/ports/turbobase64/CMakeLists.txt b/ports/turbobase64/CMakeLists.txt new file mode 100644 index 000000000..c4fcebc47 --- /dev/null +++ b/ports/turbobase64/CMakeLists.txt @@ -0,0 +1,70 @@ +cmake_minimum_required(VERSION 3.14) + +project(turbobase64 C) +if (SOURCE_PATH) + set(CMAKE_SOURCE_DIR ${SOURCE_PATH}) +endif () + +#Copyright 2016-2020 Yandex LLC +# https://github.com/ClickHouse/ClickHouse/blob/master/contrib/base64-cmake/CMakeLists.txt +# +#Apache License +#Version 2.0, January 2004 +#http://www.apache.org/licenses/ +#Yandex code starts + +SET(LIBRARY_DIR ${CMAKE_SOURCE_DIR}) + +add_library(base64_scalar OBJECT ${LIBRARY_DIR}/turbob64c.c ${LIBRARY_DIR}/turbob64d.c) +add_library(base64_ssse3 OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This file also contains code for ARM NEON + +if (ARCH_AMD64) + add_library(base64_avx OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This is not a mistake. One file is compiled twice. + add_library(base64_avx2 OBJECT ${LIBRARY_DIR}/turbob64avx2.c) +endif () + +target_compile_options(base64_scalar PRIVATE -falign-loops) + +if (ARCH_AMD64) + target_compile_options(base64_ssse3 PRIVATE -mssse3 -falign-loops) + target_compile_options(base64_avx PRIVATE -falign-loops -mavx) + target_compile_options(base64_avx2 PRIVATE -falign-loops -mavx2) +else () + target_compile_options(base64_ssse3 PRIVATE -falign-loops) +endif () + +if (ARCH_AMD64) + add_library(base64 + $<TARGET_OBJECTS:base64_scalar> + $<TARGET_OBJECTS:base64_ssse3> + $<TARGET_OBJECTS:base64_avx> + $<TARGET_OBJECTS:base64_avx2>) +else () + add_library(base64 + $<TARGET_OBJECTS:base64_scalar> + $<TARGET_OBJECTS:base64_ssse3>) +endif () + +# End of Yandex code + +target_include_directories(base64 SYSTEM PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) +set_target_properties(base64 PROPERTIES PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/turbob64.h") + +install(TARGETS base64 + EXPORT base64Config + RUNTIME DESTINATION "bin" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + PUBLIC_HEADER DESTINATION "include" + COMPONENT dev + ) + +export(TARGETS base64 + NAMESPACE TURBO:: + FILE "share/base64/base64Config.cmake" + ) + +install(EXPORT base64Config + DESTINATION "share/base64" + NAMESPACE TURBO:: + )
\ No newline at end of file diff --git a/ports/turbobase64/CONTROL b/ports/turbobase64/CONTROL new file mode 100644 index 000000000..2709230da --- /dev/null +++ b/ports/turbobase64/CONTROL @@ -0,0 +1,4 @@ +Source: turbobase64 +Version: 2020-01-12 +Description: Fastest Base64 SIMD/Neon library +Homepage: https://github.com/powturbo/Turbo-Base64
\ No newline at end of file diff --git a/ports/turbobase64/portfile.cmake b/ports/turbobase64/portfile.cmake new file mode 100644 index 000000000..0c4e89e63 --- /dev/null +++ b/ports/turbobase64/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_fail_port_install(ON_TARGET "UWP" "Windows") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO powturbo/Turbo-Base64 + REF 95ba56a9b041f9933f5cd2bbb2ee4e083468c20a + SHA512 bacab8ede5e20974207e01c13a93e6d8afc8d08bc84f1da2b6efa1b4d17408cef6cea085e209a8b7d3b2e2a7223a785f8c76aa954c3c787e9b8d891880b63606 + HEAD_REF master +) + +configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt index 21f6294e8..0a5fd0dae 100644 --- a/ports/usockets/CMakeLists.txt +++ b/ports/usockets/CMakeLists.txt @@ -20,6 +20,27 @@ include_directories(APPEND "${CMAKE_CURRENT_LIST_DIR}/src") file(GLOB SOURCES src/*.c src/eventing/*.c) +set(USOCKETS_EXT_INCLUDE_DIR ) +set(USOCKETS_EXT_LIBS ) + +if (CMAKE_USE_OPENSSL) + find_package(OpenSSL REQUIRED) + file(GLOB SSL_SOURCES src/crypto/*.c) + list(APPEND SOURCES ${SSL_SOURCES}) + list(APPEND USOCKETS_EXT_LIBS OpenSSL::SSL OpenSSL::Crypto) +endif() + +if (CMAKE_USE_EVENT) + file(GLOB SSL_SOURCES src/eventing/*.c) + list(APPEND SOURCES ${SSL_SOURCES}) + list(APPEND USOCKETS_EXT_INCLUDE_DIR src/internal/eventing) +endif() + +if (CMAKE_USE_NETWORK) + list(APPEND USOCKETS_EXT_INCLUDE_DIR src/internal/networking) + list(APPEND USOCKETS_EXT_LIBS Ws2_32) +endif() + add_library(uSockets ${SOURCES}) if (${LIBUS_USE_LIBUV}) @@ -27,8 +48,8 @@ if (${LIBUS_USE_LIBUV}) endif() target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL}) -target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${LIBUV_INCLUDE_DIR} ) -target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY}) +target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${LIBUV_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR}) +target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY} ${USOCKETS_EXT_LIBS}) install(TARGETS uSockets RUNTIME DESTINATION bin diff --git a/ports/usockets/CONTROL b/ports/usockets/CONTROL index 6078aa0ec..9c8143f40 100644 --- a/ports/usockets/CONTROL +++ b/ports/usockets/CONTROL @@ -1,4 +1,15 @@ Source: usockets -Version: 0.3.5 +Version: 0.3.5-1 Build-Depends:libuv -Description: Miniscule cross-platform eventing, networking & crypto for async applications
\ No newline at end of file +Description: Miniscule cross-platform eventing, networking & crypto for async applications + +Feature: ssl +Build-Depends: openssl +Description: Build usockets with openssl support + +Feature: event +Description: Build usockets with epoll support + +Feature: network +Build-Depends: winsock2 +Description: Build usockets with winsock support
\ No newline at end of file diff --git a/ports/usockets/portfile.cmake b/ports/usockets/portfile.cmake index b9b4a62ab..9fdd15b49 100644 --- a/ports/usockets/portfile.cmake +++ b/ports/usockets/portfile.cmake @@ -12,13 +12,20 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -set(USE_OPENSSL OFF) +if ("network" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature network only support Windows") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + ssl CMAKE_USE_OPENSSL + event CMAKE_USE_EVENT + network CMAKE_USE_NETWORK +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DCMAKE_USE_OPENSSL=${USE_OPENSSL} + OPTIONS ${FEATURE_OPTIONS} -DLIBUS_USE_LIBUV=${USE_LIBUV} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF diff --git a/ports/uwebsockets/CONTROL b/ports/uwebsockets/CONTROL index 76df622b3..f9f1c8c05 100644 --- a/ports/uwebsockets/CONTROL +++ b/ports/uwebsockets/CONTROL @@ -1,5 +1,5 @@ Source: uwebsockets -Version: 0.17.1 +Version: 0.17.2 Build-Depends: zlib, usockets Homepage: https://github.com/uWebSockets/uWebSockets -Description: Simple, secure & standards compliant web I/O for the most demanding of applications
\ No newline at end of file +Description: Simple, secure & standards compliant web I/O for the most demanding of applications diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 19daf8930..e7a4104a1 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF 588d234d45064fc70c0b6871383cbed2b6ff9d20 # v0.17.1 - SHA512 9fb5317e0b0877da737d331c5532eaac6c90e8e7fb38aff9f526ea36be98bbc59bb9dde856bcbd412c48c1703f095d981fe2aada6200df4c618ad2da4b68e9c0 + REF 7313e0168d1044b77ff262d398ae5669eb64b130 # v0.17.2 + SHA512 02888ebe3e678c9ba0d072543cb04041cc72881074a0feb05eaef3d9eb570c4b4cc4319d3b5ccdd3eca8bc93946aa0669edcbc1508fb03153251f3a1b629cfac HEAD_REF master ) file(COPY ${SOURCE_PATH}/src DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(RENAME ${CURRENT_PACKAGES_DIR}/include/src ${CURRENT_PACKAGES_DIR}/include/uwebsockets/) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 4ddfb5334..4743c6520 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -1,9 +1,7 @@ -if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(NOT VCPKG_TARGET_IS_WINDOWS) message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n") endif() -include(vcpkg_common_functions) - set(VTK_SHORT_VERSION "8.2") set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # ============================================================================= @@ -83,9 +81,13 @@ if(VTK_WITH_ALL_MODULES) ) endif() -set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/proj.lib") -set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib") - +if (VCPKG_TARGET_IS_WINDOWS) + set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/proj.lib") + set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib") +else() + set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libproj.a") + set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libproj.a") +endif() # ============================================================================= # Configure & Install @@ -250,7 +252,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # ============================================================================= # Handle copyright -file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/vtk/copyright) +file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL index 3e2cc3d51..2c2736e8e 100644 --- a/ports/xlnt/CONTROL +++ b/ports/xlnt/CONTROL @@ -1,4 +1,4 @@ Source: xlnt
-Version: 1.4.0
+Version: 1.4.0-1
Homepage: https://github.com/tfussell/xlnt
Description: Cross-platform user-friendly xlsx library for C++14
diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake index 42e188335..0da394c9a 100644 --- a/ports/xlnt/portfile.cmake +++ b/ports/xlnt/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tfussell/xlnt - REF v1.4.0 - SHA512 74abbee97994098fb7d8fd0839929db74fe01b8428f8bdb8edd28340d3b3ed04d4c7d6dd5d886ae766054ff1b0fe9a8275098a1462e7a5146ff09f1cdb063360 + REF 85e6878cc41d4c5ad002e961dc1fe35e41f936b6 # v1.4.0 + SHA512 335198fbcc1b3028e38bced4ee26047047b02372b6c52727a64c0cab6db19cc31be8ac6c08e96f415875a181d6f717082220b0f63f08ef6ac194927e2184a9df HEAD_REF master PATCHES ${win_patch} diff --git a/ports/xmlsec/CMakeLists.txt b/ports/xmlsec/CMakeLists.txt index 43664633a..4805839fe 100644 --- a/ports/xmlsec/CMakeLists.txt +++ b/ports/xmlsec/CMakeLists.txt @@ -105,11 +105,14 @@ else() endif() install(TARGETS libxmlsec libxmlsec-openssl + EXPORT xmlsecExport RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +install(EXPORT xmlsecExport FILE xmlsec-config.cmake DESTINATION share/xmlsec) + if(INSTALL_HEADERS_TOOLS) file(GLOB PUBLIC_HEADERS include/xmlsec/*.h diff --git a/ports/xmlsec/CONTROL b/ports/xmlsec/CONTROL index a4512a967..77e31db47 100644 --- a/ports/xmlsec/CONTROL +++ b/ports/xmlsec/CONTROL @@ -1,5 +1,5 @@ Source: xmlsec -Version: 1.2.29-1 +Version: 1.2.29-2 Homepage: https://www.aleksey.com/xmlsec/ Description: XML Security Library is a C library based on LibXML2. The library supports major XML security standards. Build-Depends: libxml2, openssl diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index 8fa2bfec6..9c6d8d7f3 100644 --- a/ports/xmlsec/portfile.cmake +++ b/ports/xmlsec/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec @@ -21,6 +19,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/xorstr/CONTROL b/ports/xorstr/CONTROL index f3555680c..fe40c1c72 100644 --- a/ports/xorstr/CONTROL +++ b/ports/xorstr/CONTROL @@ -1,4 +1,4 @@ Source: xorstr -Version: 2019-08-10 +Version: 2020-02-11 Description: Heavily vectorized c++17 compile time string encryption Homepage: https://github.com/JustasMasiulis/xorstr diff --git a/ports/xorstr/portfile.cmake b/ports/xorstr/portfile.cmake index 3d97ba190..5fa39e94a 100644 --- a/ports/xorstr/portfile.cmake +++ b/ports/xorstr/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/xorstr - REF 5d7371dcb70601ce9c252d475cc3dc6cf8f1e0db - SHA512 7625d2ebdb95a5414f0a1ac7ac8951b612d5159be5eccce4e13b88a4d17ffa3c65ff81ce5df5b64064b5712da7238ec1f564d2c213852731cad30c367ebad72e + REF a774b984f5b5f15d39ba0a8623cd3c70c05d6007 + SHA512 339fe945e39d27dfc9a9f42bbf4ef008405934668784ee4b661ee9dd04ab0a0bea442c07e7315d1746edd047a6bb7aca7d382314a48fc593633d811cf67bdb2d HEAD_REF master ) diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL index aa7c7b6e9..601fb1bc0 100644 --- a/ports/zlib/CONTROL +++ b/ports/zlib/CONTROL @@ -1,4 +1,4 @@ Source: zlib -Version: 1.2.11-5 +Version: 1.2.11-6 Homepage: https://www.zlib.net/ Description: A compression library diff --git a/ports/zlib/cmake_dont_build_more_than_needed.patch b/ports/zlib/cmake_dont_build_more_than_needed.patch index 229a2d055..a374f76d6 100644 --- a/ports/zlib/cmake_dont_build_more_than_needed.patch +++ b/ports/zlib/cmake_dont_build_more_than_needed.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fe939d..8d2f5f1 100644 +index 0fe939d..a1291d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ set(VERSION "1.2.11") @@ -10,24 +10,56 @@ index 0fe939d..8d2f5f1 100644 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") -@@ -211,7 +212,15 @@ elseif(BUILD_SHARED_LIBS AND WIN32) +@@ -124,9 +125,11 @@ set(ZLIB_SRCS + ) + + if(NOT MINGW) +- set(ZLIB_DLL_SRCS +- win32/zlib1.rc # If present will override custom build rule below. +- ) ++ if(BUILD_SHARED_LIBS) ++ set(ZLIB_DLL_SRCS ++ win32/zlib1.rc # If present will override custom build rule below. ++ ) ++ endif() + endif() + + if(CMAKE_COMPILER_IS_GNUCC) +@@ -180,11 +183,12 @@ if(MINGW) + -I ${CMAKE_CURRENT_BINARY_DIR} + -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) +- set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) ++ if(BUILD_SHARED_LIBS) ++ set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) ++ endif() + endif(MINGW) + +-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) ++add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + set_target_properties(zlib PROPERTIES SOVERSION 1) + +@@ -201,7 +205,7 @@ endif() + + if(UNIX) + # On unix-like platforms the library is almost always called libz +- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) ++ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) + if(NOT APPLE) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +@@ -211,7 +215,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32) endif() if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) - install(TARGETS zlib zlibstatic -+ if (BUILD_SHARED_LIBS) -+ set(ZLIB_TARGETS zlib) -+ set_target_properties(zlibstatic PROPERTIES EXCLUDE_FROM_ALL ON) -+ else() -+ set(ZLIB_TARGETS zlibstatic) -+ set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL ON) -+ endif() -+ -+ install(TARGETS ${ZLIB_TARGETS} ++ install(TARGETS zlib RUNTIME DESTINATION "${INSTALL_BIN_DIR}" ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) -@@ -230,6 +239,7 @@ endif() +@@ -230,6 +234,7 @@ endif() # Example binaries #============================================================================ @@ -35,7 +67,7 @@ index 0fe939d..8d2f5f1 100644 add_executable(example test/example.c) target_link_libraries(example zlib) add_test(example example) -@@ -247,3 +257,4 @@ if(HAVE_OFF64_T) +@@ -247,3 +252,4 @@ if(HAVE_OFF64_T) target_link_libraries(minigzip64 zlib) set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") endif() diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 78030309b..01c331b11 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -31,16 +31,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -# Both dynamic and static are built, so keep only the one needed -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/lib/zlib.lib) - endif() - if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibd.lib) - endif() -endif() - file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zlib RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/zydis/CONTROL b/ports/zydis/CONTROL index bd4f59d95..3d50b2023 100644 --- a/ports/zydis/CONTROL +++ b/ports/zydis/CONTROL @@ -1,3 +1,4 @@ Source: zydis -Version: 2.0.3 +Version: 3.1.0 +Homepage: https://zydis.re Description: Fast and lightweight x86/x86-64 disassembler library.
\ No newline at end of file diff --git a/ports/zydis/portfile.cmake b/ports/zydis/portfile.cmake index 412cbdf87..d3dfe1216 100644 --- a/ports/zydis/portfile.cmake +++ b/ports/zydis/portfile.cmake @@ -1,16 +1,31 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zyantific/zydis - REF v2.0.3 - SHA512 254aee734f93ee51a8b963404f79d6edfd0831867763243b8020c44ec2d7dd4cb7e445248df4a9af7cd2743c020674df482661d59d3278a44d2ad9a2e0611a39 + REF bfee99f49274a0eec3ffea16ede3a5bda9cda88f + SHA512 de47c4a22d22e753b3d06cb6210a9df2f944b0828e49d573cadb9b0c37d590a44db74542e07eced4b0188a97b825f4990943bab1b14edfd58d80368de4299759 + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH ZYCORE_SOURCE_PATH + REPO zyantific/zycore-c + REF 3435866ecaa837376807ce934d2088ae46aa3fa3 + SHA512 7e25254a0c17158789a3eca417cea8abe6a938cdc91cb395bd0ce1d791c8bd6b4ee0c994ca6c8372e17c03abfb3653c9053c5d56e0a4641d765c8474fae771d2 HEAD_REF master ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(ZYDIS_BUILD_SHARED_LIB OFF) +else() + set(ZYDIS_BUILD_SHARED_LIB ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + "-DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB}" + "-DZYDIS_ZYCORE_PATH=${ZYCORE_SOURCE_PATH}" ) vcpkg_install_cmake() @@ -27,5 +42,4 @@ endif() vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 36ddfe66e..ec32e53fb 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -46,9 +46,9 @@ function Generate() $controlDeps = ($Depends | sort) -join ", "
$versionSuffix = ""
- if ($Name -eq "iostreams")
+ if ($PortName -eq "iostreams" -or $PortName -eq "python")
{
- $versionsuffix = "-1"
+ $versionSuffix = "-1"
}
mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null
@@ -363,7 +363,7 @@ foreach ($library in $libraries) if ($library -eq "python")
{
- $deps += @("python3 (!osx&!linux)")
+ $deps += @("python3")
$needsBuild = $true
}
elseif ($library -eq "iostreams")
diff --git a/scripts/boost/post-source-stubs/python.cmake b/scripts/boost/post-source-stubs/python.cmake index 5610c489d..5e2ae2b76 100644 --- a/scripts/boost/post-source-stubs/python.cmake +++ b/scripts/boost/post-source-stubs/python.cmake @@ -1,5 +1,8 @@ -# Find Python. Can't use find_package here, but we already know where everything is
-file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python3.*")
-set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
-set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
-string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION "${PYTHON_INCLUDE_PATH}")
+# Find Python3 executable
+vcpkg_find_acquire_program(PYTHON3)
+set(VCPKG_PYTHON_EXECUTABLE "${PYTHON3}")
+# Find Python3 libraries. Can't use find_package here, but we already know where everything is
+file(GLOB VCPKG_PYTHON_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*")
+set(VCPKG_PYTHON_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+set(VCPKG_PYTHON_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
+string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON_VERSION "${VCPKG_PYTHON_INCLUDE}")
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 3817fd691..1eaf1c598 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -412,13 +412,16 @@ if ($ec -ne 0) } Write-Host "`nBuilding vcpkg.exe... done.`n" -Write-Host @" +if (-not $disableMetrics) +{ + Write-Host @" Telemetry --------- vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running bootstrap-vcpkg.bat with -disableMetrics. Read more about vcpkg telemetry at docs/about/privacy.md "@ +} Write-Verbose "Placing vcpkg.exe in the correct location" diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 0af6b37ff..bf8de7897 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -263,8 +263,10 @@ mkdir -p "$buildDir" rm -rf "$vcpkgRootDir/vcpkg" cp "$buildDir/vcpkg" "$vcpkgRootDir/" -echo "Telemetry" -echo "---------" -echo "vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running bootstrap-vcpkg.sh with -disableMetrics" -echo "Read more about vcpkg telemetry at docs/about/privacy.md" -echo ""
\ No newline at end of file +if ! [ "$vcpkgDisableMetrics" = "ON" ]; then + echo "Telemetry" + echo "---------" + echo "vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running bootstrap-vcpkg.sh with -disableMetrics" + echo "Read more about vcpkg telemetry at docs/about/privacy.md" + echo "" +fi diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 00bc030c3..d310daf71 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -7,10 +7,10 @@ ## fail - the port does not build in the CI system.
## This is not necessarily the same as if a port is expected to build
## on a developers machine because it may fail due to the machine
-## configuration. When set to fail the CI system will still attempt
+## configuration. When set to fail the CI system will still attempt
## to build the port and will report a CI failure until this file is updated.
## skip - Do not build this port in the CI system.
-## This is added to ports that may be flaky or conflict with other
+## This is added to ports that may be flaky or conflict with other
## ports. Please comment for why a port is skipped so it can be
## removed when the issue is resolved.
## ignore - attempt to build the port, but do not fail the CI test if the
@@ -27,7 +27,7 @@ ## x64-windows
## x64-windows-static
## x86-windows
-##
+##
# Add new items alphabetically
@@ -45,7 +45,6 @@ 7zip:x64-osx=fail
7zip:x64-uwp=fail
abseil:arm-uwp=fail
-abseil:x64-uwp=fail
ace:arm64-windows=fail
ace:arm-uwp=fail
ace:x64-osx=fail
@@ -171,8 +170,6 @@ boost-locale:arm-uwp=fail boost-locale:x64-uwp=fail
boost-log:arm-uwp=fail
boost-log:x64-uwp=fail
-boost-python:x64-linux=ignore
-boost-mpi:x64-linux=fail
boost-mpi:x64-osx=fail
boost-stacktrace:arm-uwp=fail
boost-stacktrace:x64-uwp=fail
@@ -187,8 +184,6 @@ box2d:x64-uwp=fail box2d:arm-uwp=fail
breakpad:arm64-windows=fail
breakpad:x64-osx=fail
-brotli:arm-uwp=fail
-brotli:x64-uwp=fail
bullet3:arm64-windows=fail
bullet3:arm-uwp=fail
bullet3:x64-uwp=fail
@@ -293,8 +288,6 @@ cppmicroservices:x64-uwp=fail cpp-netlib:arm-uwp=fail
cpp-netlib:x64-uwp=fail
cpp-netlib:x64-linux=ignore
-cpprestsdk:arm-uwp=fail
-cpprestsdk:x64-uwp=fail
cpp-taskflow:x64-osx=fail
cppunit:arm64-windows=fail
cppunit:arm-uwp=fail
@@ -320,8 +313,6 @@ cudnn:x64-uwp=fail cudnn:x64-windows-static=fail
cudnn:x86-windows=fail
cutelyst2:x64-osx=fail
-darknet:arm-uwp=fail
-darknet:x64-uwp=fail
date:arm64-windows=fail
dbow2:x64-osx=fail
dcmtk:arm64-windows=fail
@@ -378,6 +369,11 @@ duilib:arm-uwp=fail duilib:x64-linux=fail
duilib:x64-osx=fail
duilib:x64-uwp=fail
+
+# requires python@2 from brew, but that no longer exists
+# python2 EOL yay!
+duktape:x64-osx=skip
+
dxut:arm64-windows=fail
dxut:arm-uwp=fail
dxut:x64-linux=fail
@@ -430,6 +426,12 @@ fann:x64-linux=fail fann:x64-osx=fail
fann:x64-uwp=fail
fann:x64-windows-static=fail
+farmhash:arm64-windows=fail
+farmhash:arm-uwp=fail
+farmhash:x64-uwp=fail
+farmhash:x64-windows=fail
+farmhash:x64-windows-static=fail
+farmhash:x86-windows=fail
fastcdr:x64-linux=fail
fastrtps:arm-uwp=fail
fastrtps:x64-linux=fail
@@ -573,7 +575,6 @@ graphite2:x64-uwp=fail graphqlparser:arm-uwp=fail
graphqlparser:x64-uwp=fail
grpc:arm-uwp=fail
-grpc:x64-uwp=fail
gsl:arm-uwp=fail
gsl:x64-uwp=fail
gsoap:arm-uwp=ignore
@@ -592,6 +593,13 @@ halide:x64-windows-static=fail hdf5:arm64-windows=fail
hdf5:arm-uwp=fail
hdf5:x64-uwp=fail
+healpix:x86-windows=fail
+healpix:x64-windows=fail
+healpix:x64-windows-static=fail
+healpix:x64-uwp=fail
+healpix:arm64-windows=fail
+healpix:arm-uwp=fail
+healpix:x64-osx=fail
hidapi:arm64-windows=fail
hidapi:arm-uwp=fail
hidapi:x64-linux=fail
@@ -663,9 +671,7 @@ jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail
jinja2cpplight:arm-uwp=fail
jinja2cpplight:x64-uwp=fail
-kd-soap:x64-linux=fail
kd-soap:x64-osx=fail
-kd-soap:x64-windows-static=fail
keystone:arm64-windows=fail
keystone:arm-uwp=fail
keystone:x64-uwp=fail
@@ -715,6 +721,9 @@ libconfig:x64-osx=fail libcopp:arm64-windows=fail
libcopp:arm-uwp=fail
libcopp:x64-windows-static=fail
+libcpuid:arm-uwp=fail
+libcpuid:x64-uwp=fail
+libcpuid:arm64-windows=fail
libdatrie:x64-linux=fail
libdatrie:x64-osx=fail
libdisasm:arm-uwp=fail
@@ -768,6 +777,7 @@ libhdfs3:x64-uwp=fail libhdfs3:x64-windows=fail
libhdfs3:x64-windows-static=fail
libhdfs3:x86-windows=fail
+libhdfs3:x64-linux=fail
libhydrogen:arm64-windows=fail
libics:arm-uwp=fail
libics:x64-uwp=fail
@@ -828,7 +838,6 @@ libmodplug:arm-uwp=fail libmodplug:x64-uwp=fail
libmupdf:x64-linux=fail
libmupdf:x64-osx=fail
-libmysql:x64-osx=fail
libmysql:x86-windows=fail
libnice:x64-linux=fail
libnice:x64-osx=fail
@@ -1142,6 +1151,9 @@ msmpi:x64-osx=fail msmpi:x64-uwp=fail
muparser:arm-uwp=fail
muparser:x64-uwp=fail
+murmurhash:arm-uwp=fail
+murmurhash:x64-uwp=fail
+murmurhash:arm64-windows=fail
nana:arm-uwp=fail
nana:x64-linux=fail
nana:x64-osx=fail
@@ -1237,6 +1249,7 @@ opencensus-cpp:arm64-windows=fail opencensus-cpp:x64-windows=fail
opencensus-cpp:x64-windows-static=fail
opencensus-cpp:x86-windows=fail
+opencensus-cpp:x64-uwp=fail
opencl:arm64-windows=fail
opencl:arm-uwp=fail
opencl:x64-uwp=fail
@@ -1318,9 +1331,13 @@ opusfile:x64-uwp=fail orc:x64-linux=ignore
orocos-kdl:arm-uwp=fail
orocos-kdl:x64-uwp=fail
-osg:x64-linux=fail
-osg:x64-osx=fail
-osg:x64-windows-static=fail
+osg:x86-windows=skip
+osg:x64-windows=skip
+osgearth:x64-osx=fail
+osgearth:x64-linux=fail
+osgearth:x64-windows-static=fail
+osg-qt:x64-windows-static=fail
+osg-qt:x64-linux=fail
otl:x64-windows=ignore
otl:x64-windows-static=ignore
otl:x64-uwp=ignore
@@ -1532,6 +1549,13 @@ rpclib:x86-windows=ignore rpclib:x64-windows-static=ignore
rttr:arm-uwp=fail
rttr:x64-uwp=fail
+rxspencer:x64-uwp=fail
+rxspencer:arm-uwp=fail
+ryu:arm-uwp=fail
+ryu:x64-uwp=fail
+ryu:x64-windows-static=fail
+ryu:x86-windows=fail
+ryu::arm64-windows=fail
scintilla:arm-uwp=fail
scintilla:x64-linux=fail
scintilla:x64-osx=fail
@@ -1597,6 +1621,11 @@ shogun:x86-windows = skip simdjson:arm64-windows=fail
simdjson:arm-uwp=fail
simdjson:x86-windows=fail
+skia:arm64-windows=fail
+skia:arm-uwp=fail
+skia:x64-linux=fail
+skia:x64-uwp=fail
+skia:x86-windows=fail
slikenet:arm-uwp=fail
slikenet:x64-uwp=fail
smpeg2:arm-uwp=fail
@@ -1651,6 +1680,9 @@ stormlib:arm-uwp=fail stormlib:x64-uwp=fail
stxxl:arm-uwp=fail
stxxl:x64-uwp=fail
+superlu:arm64-windows=fail
+superlu:arm-uwp=fail
+superlu:x64-uwp=fail
systemc:arm64-windows=fail
systemc:arm-uwp=fail
systemc:x64-uwp=fail
@@ -1701,14 +1733,8 @@ tinkerforge:arm-uwp=fail tinkerforge:x64-uwp=fail
tinyexif:arm-uwp=fail
tinyexif:x64-uwp=fail
-tinyfiledialogs:arm64-windows=fail
tinyfiledialogs:arm-uwp=fail
-tinyfiledialogs:x64-linux=fail
tinyfiledialogs:x64-uwp=fail
-tinyfiledialogs:x64-windows=fail
-tinyfiledialogs:x64-windows-static=fail
-tinyfiledialogs:x86-windows=fail
-tinyfiledialogs:x64-osx=fail
tinynpy:x64-linux=ignore
tiny-process-library:arm-uwp=fail
tiny-process-library:x64-uwp=fail
@@ -1737,6 +1763,12 @@ torch-th:x64-uwp=fail torch-th:x64-windows-static=fail
tre:x64-osx=fail
treehopper:x64-windows-static=fail
+turbobase64:arm64-windows=fail
+turbobase64:arm-uwp=fail
+turbobase64:x64-uwp=fail
+turbobase64:x64-windows=fail
+turbobase64:x64-windows-static=fail
+turbobase64:x86-windows=fail
unicorn:arm64-windows=fail
unicorn:arm-uwp=fail
unicorn:x64-linux=fail
diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index 8957fca27..9088def1b 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -1,6 +1,6 @@ ## # vcpkg_apply_patches ## -## Apply a set of patches to a source tree. +## Apply a set of patches to a source tree. This function is deprecated in favor of the `PATCHES` argument to `vcpkg_from_github()` et al. ## ## ## Usage ## ```cmake @@ -27,10 +27,8 @@ ## ## ## Examples ## -## * [boost](https://github.com/Microsoft/vcpkg/blob/master/ports/boost/portfile.cmake) -## * [freetype](https://github.com/Microsoft/vcpkg/blob/master/ports/freetype/portfile.cmake) -## * [libpng](https://github.com/Microsoft/vcpkg/blob/master/ports/libpng/portfile.cmake) - +## * [libbson](https://github.com/Microsoft/vcpkg/blob/master/ports/libbson/portfile.cmake) +## * [gdal](https://github.com/Microsoft/vcpkg/blob/master/ports/gdal/portfile.cmake) function(vcpkg_apply_patches) cmake_parse_arguments(_ap "QUIET" "SOURCE_PATH" "PATCHES" ${ARGN}) @@ -43,13 +41,14 @@ function(vcpkg_apply_patches) _execute_process( COMMAND ${GIT} --work-tree=. --git-dir=.git apply "${ABSOLUTE_PATCH}" --ignore-whitespace --whitespace=nowarn --verbose OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log - ERROR_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log + ERROR_VARIABLE error WORKING_DIRECTORY ${_ap_SOURCE_PATH} RESULT_VARIABLE error_code ) + file(WRITE "${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log" "${error}") if(error_code AND NOT _ap_QUIET) - message(FATAL_ERROR "Applying patch failed. Patch needs to be updated to work with source being used by vcpkg!") + message(FATAL_ERROR "Applying patch failed. ${error}") endif() math(EXPR PATCHNUM "${PATCHNUM}+1") diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 260f2471e..9766bd267 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -38,7 +38,7 @@ ## Specifies the precise generator to use. ## ## This is useful if some project-specific buildsystem has been wrapped in a cmake script that won't perform an actual build. -## If used for this purpose, it should be set to "NMake Makefiles". +## If used for this purpose, it should be set to `"NMake Makefiles"`. ## ## ### OPTIONS ## Additional options passed to CMake during the configuration. diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 6dfb266cf..bbff5e9f6 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -1,3 +1,38 @@ +## # vcpkg_configure_meson +## +## Configure Meson for Debug and Release builds of a project. +## +## ## Usage +## ```cmake +## vcpkg_configure_meson( +## SOURCE_PATH <${SOURCE_PATH}> +## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] +## [OPTIONS_RELEASE <-DOPTIMIZE=1>...] +## [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +## ) +## ``` +## +## ## Parameters +## ### SOURCE_PATH +## Specifies the directory containing the `meson.build`. +## By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. +## +## ### OPTIONS +## Additional options passed to Meson during the configuration. +## +## ### OPTIONS_RELEASE +## Additional options passed to Meson during the Release configuration. These are in addition to `OPTIONS`. +## +## ### OPTIONS_DEBUG +## Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`. +## +## ## Notes +## This command supplies many common arguments to Meson. To see the full list, examine the source. +## +## ## Examples +## +## * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) +## * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) function(vcpkg_configure_meson) cmake_parse_arguments(_vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" ${ARGN}) @@ -5,16 +40,19 @@ function(vcpkg_configure_meson) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) # use the same compiler options as in vcpkg_configure_cmake + if(NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "vcpkg_configure_meson() currently only supports windows targets.") + endif() set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} /DWIN32 /D_WINDOWS /W3 /utf-8") set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc") - if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic) + if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1") set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1") set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} /MD /O2 /Gy /DNDEBUG /Z7") set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} /MD /O2 /Gy /DNDEBUG /Z7") - elseif(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static) + elseif(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL "static") set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1") set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1") @@ -28,7 +66,7 @@ function(vcpkg_configure_meson) # select meson cmd-line options list(APPEND _vcm_OPTIONS -Dcmake_prefix_path=${CURRENT_INSTALLED_DIR}) list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _vcm_OPTIONS --default-library shared) else() list(APPEND _vcm_OPTIONS --default-library static) diff --git a/scripts/cmake/vcpkg_fail_port_install.cmake b/scripts/cmake/vcpkg_fail_port_install.cmake index 0fdacb639..cf8777506 100644 --- a/scripts/cmake/vcpkg_fail_port_install.cmake +++ b/scripts/cmake/vcpkg_fail_port_install.cmake @@ -1,92 +1,95 @@ ## # vcpkg_fail_port_install
##
-## Fails the current portfile with a (default) error message
+## Checks common requirements and fails the current portfile with a (default) error message
##
## ## Usage
## ```cmake
-## vcpkg_fail_port_install([MESSAGE <message>] [ON_TARGET <target1> [<target2> ...]]
-## [ON_ARCH <arch1> [<arch2> ...]]
-## [ON_CRT_LINKAGE <link1> [<link2> ...]])
-## [ON_LIBRARY_LINKAGE <linklib1> [<linklib2> ...]])
+## vcpkg_fail_port_install(
+## [ALWAYS]
+## [MESSAGE <"Reason for failure">]
+## [ON_TARGET <Windows> [<OSX> ...]]
+## [ON_ARCH <x64> [<arm> ...]]
+## [ON_CRT_LINKAGE <static> [<dynamic> ...]])
+## [ON_LIBRARY_LINKAGE <static> [<dynamic> ...]]
+## )
## ```
##
## ## Parameters
## ### MESSAGE
-## Additional failure message. If non is given a default message will be displayed depending on the failure condition
+## Additional failure message. If none is given, a default message will be displayed depending on the failure condition.
##
## ### ALWAYS
-## will always fail early
+## Will always fail early
##
## ### ON_TARGET
-## targets for which the build should fail early. Valid targets are <target> from VCPKG_IS_TARGET_<target> (see vcpkg_common_definitions.cmake)
+## Targets for which the build should fail early. Valid targets are `<target>` from `VCPKG_IS_TARGET_<target>` (see `vcpkg_common_definitions.cmake`).
##
## ### ON_ARCH
-## architecture for which the build should fail early.
+## Architecture for which the build should fail early.
##
## ### ON_CRT_LINKAGE
## CRT linkage for which the build should fail early.
##
## ### ON_LIBRARY_LINKAGE
-## library linkage for which the build should fail early.
+## Library linkage for which the build should fail early.
##
## ## Examples
##
## * [aws-lambda-cpp](https://github.com/Microsoft/vcpkg/blob/master/ports/aws-lambda-cpp/portfile.cmake)
function(vcpkg_fail_port_install)
- cmake_parse_arguments(PARSE_ARGV 0 _csc "ALWAYS" "MESSAGE" "ON_TARGET;ON_ARCH;ON_CRT_LINKAGE;ON_LIBRARY_LINKAGE")
- if(DEFINED _csc_UNPARSED_ARGUMENTS)
- message(FATAL_ERROR "Unknown arguments passed to vcpkg_fail_port_install. Please correct the portfile!")
- endif()
- if(DEFINED _csc_MESSAGE)
- set(_csc_MESSAGE "${_csc_MESSAGE}\n")
- else()
- set(_csc_MESSAGE "")
- endif()
-
- unset(_fail_port)
- #Target fail check
- if(DEFINED _csc_ON_TARGET)
- foreach(_target ${_csc_ON_TARGET})
- string(TOUPPER ${_target} _target_upper)
- if(VCPKG_TARGET_IS_${_target_upper})
- set(_fail_port TRUE)
- set(_csc_MESSAGE "${_csc_MESSAGE}Target '${_target}' not supported by ${PORT}!\n")
- endif()
- endforeach()
- endif()
-
- #Architecture fail check
- if(DEFINED _csc_ON_ARCH)
- foreach(_arch ${_csc_ON_ARCH})
- if(${VCPKG_TARGET_ARCHITECTURE} MATCHES ${_arch})
- set(_fail_port TRUE)
- set(_csc_MESSAGE "${_csc_MESSAGE}Architecture '${_arch}' not supported by ${PORT}!\n")
- endif()
- endforeach()
- endif()
-
- #CRT linkage fail check
- if(DEFINED _csc_ON_CRT_LINKAGE)
- foreach(_crt_link ${_csc_ON_CRT_LINKAGE})
- if("${VCPKG_CRT_LINKAGE}" MATCHES "${_crt_link}")
- set(_fail_port TRUE)
- set(_csc_MESSAGE "${_csc_MESSAGE}CRT linkage '${VCPKG_CRT_LINKAGE}' not supported by ${PORT}!\n")
- endif()
- endforeach()
- endif()
-
- #Library linkage fail check
- if(DEFINED _csc_ON_LIBRARY_LINKAGE)
- foreach(_lib_link ${_csc_ON_LIBRARY_LINKAGE})
- if("${VCPKG_LIBRARY_LINKAGE}" MATCHES "${_lib_link}")
- set(_fail_port TRUE)
- set(_csc_MESSAGE "${_csc_MESSAGE}Library linkage '${VCPKG_LIBRARY_LINKAGE}' not supported by ${PORT}!\n")
- endif()
- endforeach()
- endif()
-
- if(_fail_port OR _csc_ALWAYS)
- message(FATAL_ERROR ${_csc_MESSAGE})
- endif()
+ cmake_parse_arguments(PARSE_ARGV 0 _csc "ALWAYS" "MESSAGE" "ON_TARGET;ON_ARCH;ON_CRT_LINKAGE;ON_LIBRARY_LINKAGE")
+ if(DEFINED _csc_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR "Unknown arguments passed to vcpkg_fail_port_install. Please correct the portfile!")
+ endif()
+ if(DEFINED _csc_MESSAGE)
+ set(_csc_MESSAGE "${_csc_MESSAGE}\n")
+ else()
+ set(_csc_MESSAGE "")
+ endif()
-endfunction()
\ No newline at end of file + unset(_fail_port)
+ #Target fail check
+ if(DEFINED _csc_ON_TARGET)
+ foreach(_target ${_csc_ON_TARGET})
+ string(TOUPPER ${_target} _target_upper)
+ if(VCPKG_TARGET_IS_${_target_upper})
+ set(_fail_port TRUE)
+ set(_csc_MESSAGE "${_csc_MESSAGE}Target '${_target}' not supported by ${PORT}!\n")
+ endif()
+ endforeach()
+ endif()
+
+ #Architecture fail check
+ if(DEFINED _csc_ON_ARCH)
+ foreach(_arch ${_csc_ON_ARCH})
+ if(${VCPKG_TARGET_ARCHITECTURE} MATCHES ${_arch})
+ set(_fail_port TRUE)
+ set(_csc_MESSAGE "${_csc_MESSAGE}Architecture '${_arch}' not supported by ${PORT}!\n")
+ endif()
+ endforeach()
+ endif()
+
+ #CRT linkage fail check
+ if(DEFINED _csc_ON_CRT_LINKAGE)
+ foreach(_crt_link ${_csc_ON_CRT_LINKAGE})
+ if("${VCPKG_CRT_LINKAGE}" MATCHES "${_crt_link}")
+ set(_fail_port TRUE)
+ set(_csc_MESSAGE "${_csc_MESSAGE}CRT linkage '${VCPKG_CRT_LINKAGE}' not supported by ${PORT}!\n")
+ endif()
+ endforeach()
+ endif()
+
+ #Library linkage fail check
+ if(DEFINED _csc_ON_LIBRARY_LINKAGE)
+ foreach(_lib_link ${_csc_ON_LIBRARY_LINKAGE})
+ if("${VCPKG_LIBRARY_LINKAGE}" MATCHES "${_lib_link}")
+ set(_fail_port TRUE)
+ set(_csc_MESSAGE "${_csc_MESSAGE}Library linkage '${VCPKG_LIBRARY_LINKAGE}' not supported by ${PORT}!\n")
+ endif()
+ endforeach()
+ endif()
+
+ if(_fail_port OR _csc_ALWAYS)
+ message(FATAL_ERROR ${_csc_MESSAGE})
+ endif()
+endfunction()
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index a525dbc11..ed5e010e0 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -14,20 +14,25 @@ ## The current list of programs includes: ## ## - 7Z +## - ARIA2 (Downloader) ## - BISON +## - DARK +## - DOXYGEN ## - FLEX ## - GASPREPROCESSOR +## - GPERF ## - PERL ## - PYTHON2 ## - PYTHON3 +## - GIT ## - GO ## - JOM ## - MESON ## - NASM ## - NINJA ## - NUGET +## - SCONS ## - YASM -## - ARIA2 (Downloader) ## ## Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md). ## @@ -82,6 +87,20 @@ function(vcpkg_find_acquire_program VAR) set(_vfa_RENAME "yasm.exe") set(NOEXTRACT ON) set(HASH c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) + elseif(VAR MATCHES "GIT") + set(PROGNAME git) + if(CMAKE_HOST_WIN32) + set(SUBDIR "git-2.25.1-1-windows") + set(URL "https://github.com/git-for-windows/git/releases/download/v2.25.1.windows.1/PortableGit-2.25.1-32-bit.7z.exe") + set(ARCHIVE "PortableGit-2.25.1-32-bit.7z.exe") + set(HASH 222d6e384ecae5841cb02dc004c4b3f56659d19b662bc93ab531df844c9477c9717c4a1adfb8bc2d3159678238fa4c79ccbdcb5c116eea5eccd652f4b483359e) + set(PATHS + "${DOWNLOADS}/tools/${SUBDIR}/mingw32/bin" + "${DOWNLOADS}/tools/git/${SUBDIR}/mingw32/bin") + else() + set(BREW_PACKAGE_NAME "git") + set(APT_PACKAGE_NAME "git") + endif() elseif(VAR MATCHES "GO") set(PROGNAME go) set(PATHS ${DOWNLOADS}/tools/go/go/bin) @@ -188,10 +207,10 @@ function(vcpkg_find_acquire_program VAR) else() set(SCRIPTNAME meson) endif() - set(PATHS ${DOWNLOADS}/tools/meson/meson-0.52.0) - set(URL "https://github.com/mesonbuild/meson/archive/0.52.0.zip") - set(ARCHIVE "meson-0.52.0.zip") - set(HASH 2f2657599f19933c02be2a1faa508d5b2d137fba1ccc9d68a6b6d04b8d21163c33220c673643fa444fa86e94ba010cf8a851b9e6abc096559a7c735f5099a180) + set(PATHS ${DOWNLOADS}/tools/meson/meson-0.53.2) + set(URL "https://github.com/mesonbuild/meson/archive/0.53.2.zip") + set(ARCHIVE "meson-0.53.2.zip") + set(HASH 86c3347395528d2358c9514a76ec8a60908f8abadece5ecb9bac633ea735d4b40a27683002db017f06fa48ec68ea1bfe64d216fa17a54d6d42c8bc45f55606b2) elseif(VAR MATCHES "FLEX") if(CMAKE_HOST_WIN32) set(PROGNAME win_flex) @@ -277,6 +296,12 @@ function(vcpkg_find_acquire_program VAR) set(ARCHIVE "bazel-${BAZEL_VERSION}-linux-x86_64") set(NOEXTRACT ON) set(HASH db4a583cf2996aeb29fd008261b12fe39a4a5faf0fbf96f7124e6d3ffeccf6d9655d391378e68dd0915bc91c9e146a51fd9661963743857ca25179547feceab1) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(_vfa_SUPPORTED ON) + set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-darwin-x86_64") + set(ARCHIVE "bazel-${BAZEL_VERSION}-darwin-x86_64") + set(NOEXTRACT ON) + set(HASH 420a37081e6ee76441b0d92ff26d1715ce647737ce888877980d0665197b5a619d6afe6102f2e7edfb5062c9b40630a10b2539585e35479b780074ada978d23c) else() set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.zip") set(ARCHIVE "bazel-${BAZEL_VERSION}-windows-x86_64.zip") @@ -339,6 +364,12 @@ function(vcpkg_find_acquire_program VAR) COMMAND msiexec /a ${ARCHIVE_NATIVE_PATH} /qn TARGETDIR=${DESTINATION_NATIVE_PATH} WORKING_DIRECTORY ${DOWNLOADS} ) + elseif("${ARCHIVE_PATH}" MATCHES ".7z.exe$") + vcpkg_find_acquire_program(7Z) + _execute_process( + COMMAND ${7Z} x "${ARCHIVE_PATH}" "-o${PROG_PATH_SUBDIR}" -y -bso0 -bsp0 + WORKING_DIRECTORY ${PROG_PATH_SUBDIR} + ) else() _execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE_PATH} diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index d72381be5..b2faa4abe 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -1,24 +1,42 @@ -#.rst: -# .. command:: vcpkg_fixup_cmake_targets -# -# Transforms all /debug/share/<port>/*targets-debug.cmake files and move them to /share/<port>. -# Removes all /debug/share/<port>/*targets.cmake and /debug/share/<port>/*config.cmake -# -# Transforms all references matching /bin/*.exe to /tools/<port>/*.exe on Windows -# Transforms all references matching /bin/* to /tools/<port>/* on other platforms -# -# Fixes ${_IMPORT_PREFIX} in auto generated targets to be one folder deeper. -# Replaces ${CURRENT_INSTALLED_DIR} with ${_IMPORT_PREFIX} in configs/targets. -# -# :: -# vcpkg_fixup_cmake_targets([CONFIG_PATH <config_path>]) -# -# ``CONFIG_PATH`` -# *.cmake files subdirectory (like "lib/cmake/${PORT}"). -# -# Example usage: -# vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/myPort") - +## # vcpkg_fixup_cmake_targets +## +## Merge release and debug CMake targets and configs to support multiconfig generators. +## +## Additionally corrects common issues with targets, such as absolute paths and incorrectly placed binaries. +## +## ## Usage +## ```cmake +## vcpkg_fixup_cmake_targets([CONFIG_PATH <share/${PORT}>] [TARGET_PATH <share/${PORT}>]) +## ``` +## +## ## Parameters +## +## ### CONFIG_PATH +## Subpath currently containing `*.cmake` files subdirectory (like `lib/cmake/${PORT}`). Should be relative to `${CURRENT_PACKAGES_DIR}`. +## +## Defaults to `share/${PORT}`. +## +## ### TARGET_PATH +## Subpath to which the above `*.cmake` files should be moved. Should be relative to `${CURRENT_PACKAGES_DIR}`. +## This needs to be specified if the port name differs from the `find_package()` name. +## +## Defaults to `share/${PORT}`. +## +## ## Notes +## Transform all `/debug/<CONFIG_PATH>/*targets-debug.cmake` files and move them to `/<TARGET_PATH>`. +## Removes all `/debug/<CONFIG_PATH>/*targets.cmake` and `/debug/<CONFIG_PATH>/*config.cmake`. +## +## Transform all references matching `/bin/*.exe` to `/tools/<port>/*.exe` on Windows. +## Transform all references matching `/bin/*` to `/tools/<port>/*` on other platforms. +## +## Fix `${_IMPORT_PREFIX}` in auto generated targets to be one folder deeper. +## Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. +## +## ## Examples +## +## * [concurrentqueue](https://github.com/Microsoft/vcpkg/blob/master/ports/concurrentqueue/portfile.cmake) +## * [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake) +## * [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) function(vcpkg_fixup_cmake_targets) cmake_parse_arguments(_vfct "" "CONFIG_PATH;TARGET_PATH" "" ${ARGN}) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index 7ab9d55b3..edc6c7302 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -1,7 +1,18 @@ +## # vcpkg_install_meson +## +## Builds a meson project previously configured with `vcpkg_configure_meson()`. +## +## ## Usage +## ```cmake +## vcpkg_install_meson() +## ``` +## +## ## Examples +## +## * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) +## * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) function(vcpkg_install_meson) - vcpkg_find_acquire_program(NINJA) - unset(ENV{DESTDIR}) # installation directory was already specified with '--prefix' option message(STATUS "Package ${TARGET_TRIPLET}-rel") @@ -17,5 +28,4 @@ function(vcpkg_install_meson) WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg LOGNAME package-${TARGET_TRIPLET}-dbg ) - endfunction() diff --git a/scripts/cmake/vcpkg_prettify_command.cmake b/scripts/cmake/vcpkg_prettify_command.cmake index 9d9a2b798..ca04f9120 100644 --- a/scripts/cmake/vcpkg_prettify_command.cmake +++ b/scripts/cmake/vcpkg_prettify_command.cmake @@ -4,7 +4,7 @@ ##
## ## Usage
## ```cmake
-## vcpkg_prettify_command()
+## vcpkg_prettify_command(<INPUT_VAR> <OUTPUT_VAR>)
## ```
##
## ## Examples
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 8f90ce8dc..01073fdbb 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -29,11 +29,11 @@ <archiveName>cmake-3.12.4-FreeBSD-x86_64.tar.gz</archiveName> </tool> <tool name="git" os="windows"> - <version>2.21.0-1</version> + <version>2.25.1-1</version> <exeRelativePath>mingw32\bin\git.exe</exeRelativePath> - <url>https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-32-bit.7z.exe</url> - <sha512>d5600fc35e91cfa84e3547e38a9da9798cf0a53810cc35ac9a0dee671c4ef0e9fbcbe3eda9c790f8db4eafce7ce58d7a168d28938a66cdcca000bf5a7f5267c1</sha512> - <archiveName>PortableGit-2.21.0-32-bit.7z.exe</archiveName> + <url>https://github.com/git-for-windows/git/releases/download/v2.25.1.windows.1/PortableGit-2.25.1-32-bit.7z.exe</url> + <sha512>222d6e384ecae5841cb02dc004c4b3f56659d19b662bc93ab531df844c9477c9717c4a1adfb8bc2d3159678238fa4c79ccbdcb5c116eea5eccd652f4b483359e</sha512> + <archiveName>PortableGit-2.25.1-32-bit.7z.exe</archiveName> </tool> <tool name="git" os="linux"> <version>2.7.4</version> diff --git a/toolsrc/include/vcpkg/cmakevars.h b/toolsrc/include/vcpkg/cmakevars.h index 8d131d45e..1c02376b9 100644 --- a/toolsrc/include/vcpkg/cmakevars.h +++ b/toolsrc/include/vcpkg/cmakevars.h @@ -1,15 +1,21 @@ #pragma once -#include <vcpkg/base/hash.h> -#include <vcpkg/base/system.process.h> +#include <vcpkg/base/optional.h> #include <vcpkg/portfileprovider.h> #include <vcpkg/vcpkgpaths.h> +namespace vcpkg::Dependencies +{ + struct ActionPlan; +} + namespace vcpkg::CMakeVars { struct CMakeVarProvider { + virtual ~CMakeVarProvider() = default; + virtual Optional<const std::unordered_map<std::string, std::string>&> get_generic_triplet_vars( Triplet triplet) const = 0; @@ -25,45 +31,10 @@ namespace vcpkg::CMakeVars virtual void load_tag_vars(Span<const FullPackageSpec> specs, const PortFileProvider::PortFileProvider& port_provider) const = 0; - }; - - struct TripletCMakeVarProvider : Util::ResourceBase, CMakeVarProvider - { - private: - fs::path create_tag_extraction_file( - const Span<const std::pair<const FullPackageSpec*, std::string>>& spec_abi_settings) const; - - fs::path create_dep_info_extraction_file(const Span<const PackageSpec> specs) const; - - void launch_and_split(const fs::path& script_path, - std::vector<std::vector<std::pair<std::string, std::string>>>& vars) const; - public: - explicit TripletCMakeVarProvider(const vcpkg::VcpkgPaths& paths) : paths(paths) {} - - void load_generic_triplet_vars(Triplet triplet) const override; - - void load_dep_info_vars(Span<const PackageSpec> specs) const override; - - void load_tag_vars(Span<const FullPackageSpec> specs, - const PortFileProvider::PortFileProvider& port_provider) const override; - - Optional<const std::unordered_map<std::string, std::string>&> get_generic_triplet_vars( - Triplet triplet) const override; - - Optional<const std::unordered_map<std::string, std::string>&> get_dep_info_vars( - const PackageSpec& spec) const override; - - Optional<const std::unordered_map<std::string, std::string>&> get_tag_vars( - const PackageSpec& spec) const override; - - private: - const VcpkgPaths& paths; - const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE); - const fs::path get_tags_path = paths.scripts / "vcpkg_get_tags.cmake"; - const fs::path get_dep_info_path = paths.scripts / "vcpkg_get_dep_info.cmake"; - mutable std::unordered_map<PackageSpec, std::unordered_map<std::string, std::string>> dep_resolution_vars; - mutable std::unordered_map<PackageSpec, std::unordered_map<std::string, std::string>> tag_vars; - mutable std::unordered_map<Triplet, std::unordered_map<std::string, std::string>> generic_triplet_vars; + void load_tag_vars(const vcpkg::Dependencies::ActionPlan& action_plan, + const PortFileProvider::PortFileProvider& port_provider) const; }; + + std::unique_ptr<CMakeVarProvider> make_triplet_cmake_var_provider(const vcpkg::VcpkgPaths& paths); } diff --git a/toolsrc/include/vcpkg/textrowcol.h b/toolsrc/include/vcpkg/textrowcol.h index cd2b223e2..90c50d887 100644 --- a/toolsrc/include/vcpkg/textrowcol.h +++ b/toolsrc/include/vcpkg/textrowcol.h @@ -4,8 +4,8 @@ namespace vcpkg::Parse {
struct TextRowCol
{
- TextRowCol() = default;
- TextRowCol(int row, int column) : row(row), column(column) {}
+ constexpr TextRowCol() noexcept = default;
+ constexpr TextRowCol(int row, int column) noexcept : row(row), column(column) {}
/// '0' indicates uninitialized; '1' is the first row.
int row = 0;
/// '0' indicates uninitialized; '1' is the first column.
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index c6b358819..e6a81607d 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -41,7 +41,8 @@ namespace vcpkg::Build::Command const PathsPortFileProvider& provider,
const VcpkgPaths& paths)
{
- CMakeVars::TripletCMakeVarProvider var_provider(paths);
+ auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths);
+ auto& var_provider = *var_provider_storage;
var_provider.load_dep_info_vars(std::array<PackageSpec, 1>{full_spec.package_spec});
var_provider.load_tag_vars(std::array<FullPackageSpec, 1>{full_spec}, provider);
@@ -518,11 +519,30 @@ namespace vcpkg::Build else
return System::cmd_execute_modify_env(build_env_cmd, clean_env);
});
-
- const int return_code = System::cmd_execute(command, env);
#else
- const int return_code = System::cmd_execute_clean(command);
+ const auto& env = System::get_clean_environment();
#endif
+ auto buildpath = paths.buildtrees / action.spec.name();
+ if (!fs.exists(buildpath))
+ {
+ std::error_code err;
+ fs.create_directory(buildpath, err);
+ Checks::check_exit(VCPKG_LINE_INFO, !err.value(), "Failed to create directory '%s', code: %d", buildpath.u8string(), err.value());
+ }
+ auto stdoutlog = buildpath / ("stdout-" + action.spec.triplet().canonical_name() + ".log");
+ std::ofstream out_file(stdoutlog.native().c_str(), std::ios::out | std::ios::binary | std::ios::trunc);
+ Checks::check_exit(VCPKG_LINE_INFO, out_file, "Failed to open '%s' for writing", stdoutlog.u8string());
+ const int return_code = System::cmd_execute_and_stream_data(
+ command,
+ [&](StringView sv) {
+ System::print2(sv);
+ out_file.write(sv.data(), sv.size());
+ Checks::check_exit(
+ VCPKG_LINE_INFO, out_file, "Error occurred while writing '%s'", stdoutlog.u8string());
+ },
+ env);
+ out_file.close();
+
// With the exception of empty packages, builds in "Download Mode" always result in failure.
if (action.build_options.only_downloads == Build::OnlyDownloads::YES)
{
diff --git a/toolsrc/src/vcpkg/cmakevars.cpp b/toolsrc/src/vcpkg/cmakevars.cpp index 42bed5501..98b2546ed 100644 --- a/toolsrc/src/vcpkg/cmakevars.cpp +++ b/toolsrc/src/vcpkg/cmakevars.cpp @@ -1,17 +1,77 @@ #include "pch.h" +#include <vcpkg/base/hash.h> #include <vcpkg/base/optional.h> #include <vcpkg/base/span.h> +#include <vcpkg/base/system.process.h> #include <vcpkg/base/util.h> #include <vcpkg/cmakevars.h> +#include <vcpkg/dependencies.h> using namespace vcpkg; using vcpkg::Optional; -using vcpkg::CMakeVars::TripletCMakeVarProvider; namespace vcpkg::CMakeVars { + void CMakeVarProvider::load_tag_vars(const vcpkg::Dependencies::ActionPlan& action_plan, + const PortFileProvider::PortFileProvider& port_provider) const + { + std::vector<FullPackageSpec> install_package_specs; + for (auto&& action : action_plan.install_actions) + { + install_package_specs.emplace_back(FullPackageSpec{action.spec, action.feature_list}); + } + + load_tag_vars(install_package_specs, port_provider); + } + + namespace + { + struct TripletCMakeVarProvider : Util::ResourceBase, CMakeVarProvider + { + explicit TripletCMakeVarProvider(const vcpkg::VcpkgPaths& paths) : paths(paths) {} + + void load_generic_triplet_vars(Triplet triplet) const override; + + void load_dep_info_vars(Span<const PackageSpec> specs) const override; + + void load_tag_vars(Span<const FullPackageSpec> specs, + const PortFileProvider::PortFileProvider& port_provider) const override; + + Optional<const std::unordered_map<std::string, std::string>&> get_generic_triplet_vars( + Triplet triplet) const override; + + Optional<const std::unordered_map<std::string, std::string>&> get_dep_info_vars( + const PackageSpec& spec) const override; + + Optional<const std::unordered_map<std::string, std::string>&> get_tag_vars( + const PackageSpec& spec) const override; + + public: + fs::path create_tag_extraction_file( + const Span<const std::pair<const FullPackageSpec*, std::string>>& spec_abi_settings) const; + + fs::path create_dep_info_extraction_file(const Span<const PackageSpec> specs) const; + + void launch_and_split(const fs::path& script_path, + std::vector<std::vector<std::pair<std::string, std::string>>>& vars) const; + + const VcpkgPaths& paths; + const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE); + const fs::path get_tags_path = paths.scripts / "vcpkg_get_tags.cmake"; + const fs::path get_dep_info_path = paths.scripts / "vcpkg_get_dep_info.cmake"; + mutable std::unordered_map<PackageSpec, std::unordered_map<std::string, std::string>> dep_resolution_vars; + mutable std::unordered_map<PackageSpec, std::unordered_map<std::string, std::string>> tag_vars; + mutable std::unordered_map<Triplet, std::unordered_map<std::string, std::string>> generic_triplet_vars; + }; + } + + std::unique_ptr<CMakeVarProvider> make_triplet_cmake_var_provider(const vcpkg::VcpkgPaths& paths) + { + return std::make_unique<TripletCMakeVarProvider>(paths); + } + fs::path TripletCMakeVarProvider::create_tag_extraction_file( const Span<const std::pair<const FullPackageSpec*, std::string>>& spec_abi_settings) const { diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 842bb9b0a..9cf3026cb 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -223,7 +223,7 @@ namespace vcpkg::Commands::CI std::unordered_map<std::string, SourceControlFileLocation> default_feature_provider; }; - static bool supported_for_triplet(const CMakeVars::TripletCMakeVarProvider& var_provider, + static bool supported_for_triplet(const CMakeVars::CMakeVarProvider& var_provider, const InstallPlanAction* install_plan) { auto&& scfl = install_plan->source_control_file_location.value_or_exit(VCPKG_LINE_INFO); @@ -253,7 +253,7 @@ namespace vcpkg::Commands::CI const VcpkgPaths& paths, const std::set<std::string>& exclusions, const PortFileProvider::PortFileProvider& provider, - const CMakeVars::TripletCMakeVarProvider& var_provider, + const CMakeVars::CMakeVarProvider& var_provider, const std::vector<FullPackageSpec>& specs, const bool purge_tombstones) { @@ -414,7 +414,8 @@ namespace vcpkg::Commands::CI StatusParagraphs status_db = database_load_check(paths); PortFileProvider::PathsPortFileProvider provider(paths, args.overlay_ports.get()); - CMakeVars::TripletCMakeVarProvider var_provider(paths); + auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths); + auto& var_provider = *var_provider_storage; const Build::BuildPackageOptions install_plan_options = { Build::UseHeadVersion::NO, diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp index 7023547da..f153626fa 100644 --- a/toolsrc/src/vcpkg/commands.dependinfo.cpp +++ b/toolsrc/src/vcpkg/commands.dependinfo.cpp @@ -252,7 +252,8 @@ namespace vcpkg::Commands::DependInfo }
PathsPortFileProvider provider(paths, args.overlay_ports.get());
- CMakeVars::TripletCMakeVarProvider var_provider(paths);
+ auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths);
+ auto& var_provider = *var_provider_storage;
// By passing an empty status_db, we should get a plan containing all dependencies.
// All actions in the plan should be install actions, as there's no installed packages to remove.
diff --git a/toolsrc/src/vcpkg/commands.env.cpp b/toolsrc/src/vcpkg/commands.env.cpp index 6d959d425..5b673b965 100644 --- a/toolsrc/src/vcpkg/commands.env.cpp +++ b/toolsrc/src/vcpkg/commands.env.cpp @@ -40,7 +40,8 @@ namespace vcpkg::Commands::Env const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); PortFileProvider::PathsPortFileProvider provider(paths, args.overlay_ports.get()); - CMakeVars::TripletCMakeVarProvider var_provider(paths); + auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths); + auto& var_provider = *var_provider_storage; var_provider.load_generic_triplet_vars(triplet); diff --git a/toolsrc/src/vcpkg/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp index 960e9bbb3..fbce1a421 100644 --- a/toolsrc/src/vcpkg/commands.upgrade.cpp +++ b/toolsrc/src/vcpkg/commands.upgrade.cpp @@ -45,7 +45,8 @@ namespace vcpkg::Commands::Upgrade // Load ports from ports dirs PortFileProvider::PathsPortFileProvider provider(paths, args.overlay_ports.get()); - CMakeVars::TripletCMakeVarProvider var_provider(paths); + auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths); + auto& var_provider = *var_provider_storage; // input sanitization const std::vector<PackageSpec> specs = Util::fmap(args.command_arguments, [&](auto&& arg) { @@ -180,6 +181,8 @@ namespace vcpkg::Commands::Upgrade Checks::exit_fail(VCPKG_LINE_INFO); } + var_provider.load_tag_vars(action_plan, provider); + const Install::InstallSummary summary = Install::perform(action_plan, keep_going, paths, status_db, var_provider); diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index fc398bd45..af1252533 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -681,22 +681,20 @@ namespace vcpkg::Install //// Load ports from ports dirs PortFileProvider::PathsPortFileProvider provider(paths, args.overlay_ports.get()); - CMakeVars::TripletCMakeVarProvider var_provider(paths); + auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths); + auto& var_provider = *var_provider_storage; // Note: action_plan will hold raw pointers to SourceControlFileLocations from this map auto action_plan = Dependencies::create_feature_install_plan(provider, var_provider, specs, status_db); - std::vector<FullPackageSpec> install_package_specs; for (auto&& action : action_plan.install_actions) { action.build_options = install_plan_options; if (action.request_type != RequestType::USER_REQUESTED) action.build_options.use_head_version = Build::UseHeadVersion::NO; - - install_package_specs.emplace_back(FullPackageSpec{action.spec, action.feature_list}); } - var_provider.load_tag_vars(install_package_specs, provider); + var_provider.load_tag_vars(action_plan, provider); // install plan will be empty if it is already installed - need to change this at status paragraph part Checks::check_exit(VCPKG_LINE_INFO, !action_plan.empty(), "Install plan cannot be empty"); diff --git a/triplets/community/x64-windows-static-md.cmake b/triplets/community/x64-windows-static-md.cmake new file mode 100644 index 000000000..d7acd46a4 --- /dev/null +++ b/triplets/community/x64-windows-static-md.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
diff --git a/triplets/community/x86-windows-static-md.cmake b/triplets/community/x86-windows-static-md.cmake new file mode 100644 index 000000000..22abeaf2d --- /dev/null +++ b/triplets/community/x86-windows-static-md.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x86)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
|