diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-08-13 20:13:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 20:13:55 -0700 |
| commit | a3a6530631df905eb5c0e26d0b20d7d548e0c465 (patch) | |
| tree | 9750c490522529844a3e5104d25fd65abc1e1182 /ports/mimalloc | |
| parent | e6a21e1b421e8231f3eb46d8af574a990b5da8c8 (diff) | |
| download | vcpkg-a3a6530631df905eb5c0e26d0b20d7d548e0c465.tar.gz vcpkg-a3a6530631df905eb5c0e26d0b20d7d548e0c465.zip | |
[vcpkg_check_features] Set output variable explicitly and allow reverse-logic check (#7558)
* [vcpkg_check_features] Set OUT_EXPAND_OPTIONS explicitly
* [vcpkg_check_features] Allow reverse logic for features
* [vcpkg_check_features] Document new parameters
* [vcpkg_check_features] Remove unnecessary logging
* Do not create variables for each feature only set OUT_FEATURE_OPTIONS
* Improve documentation
* Update ports that use vcpkg_check_features()
* Missing documentation updates
* [pcl] Fix tools feature
* [opencv,opencv4] Fix usage of vcpkg_check_features()
* [opencv4] Fix typo
Diffstat (limited to 'ports/mimalloc')
| -rw-r--r-- | ports/mimalloc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mimalloc/portfile.cmake | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ports/mimalloc/CONTROL b/ports/mimalloc/CONTROL index 127d64590..daf48d8ce 100644 --- a/ports/mimalloc/CONTROL +++ b/ports/mimalloc/CONTROL @@ -1,5 +1,5 @@ Source: mimalloc
-Version: 2019-06-25
+Version: 2019-06-25-1
Description: Compact general purpose allocator with excellent performance
Homepage: https://github.com/microsoft/mimalloc
diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index a520b3ba5..1a11284f5 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -10,10 +10,10 @@ vcpkg_from_github( fix-cmake.patch
)
-vcpkg_check_features(
- asm MI_SEE_ASM
- secure MI_SECURE
- override MI_OVERRIDE
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ asm MI_SEE_ASM
+ secure MI_SECURE
+ override MI_OVERRIDE
)
vcpkg_configure_cmake(
@@ -24,11 +24,9 @@ vcpkg_configure_cmake( OPTIONS_RELEASE
-DMI_CHECK_FULL=OFF
OPTIONS
- -DMI_OVERRIDE=${MI_OVERRIDE}
-DMI_INTERPOSE=ON
- -DMI_SEE_ASM=${MI_SEE_ASM}
-DMI_USE_CXX=OFF
- -DMI_SECURE=${MI_SECURE}
+ ${FEATURE_OPTIONS}
)
vcpkg_install_cmake()
|