diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2019-09-21 02:29:10 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-20 11:29:10 -0700 |
| commit | 0279fd5ad2083e2e48e5f933993dde7101204d4f (patch) | |
| tree | 4521909ea35e03e3e2c3cc3738f4fd3ddbbc0c7c | |
| parent | bb171a0ffc44b2eafd5af871852f25c9367348bb (diff) | |
| download | vcpkg-0279fd5ad2083e2e48e5f933993dde7101204d4f.tar.gz vcpkg-0279fd5ad2083e2e48e5f933993dde7101204d4f.zip | |
[foonathan-memory] Fix using vcpkg_check_features error (#8266)
| -rw-r--r-- | ports/foonathan-memory/CONTROL | 2 | ||||
| -rw-r--r-- | ports/foonathan-memory/portfile.cmake | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/ports/foonathan-memory/CONTROL b/ports/foonathan-memory/CONTROL index 51c0ad7f2..8c105a104 100644 --- a/ports/foonathan-memory/CONTROL +++ b/ports/foonathan-memory/CONTROL @@ -1,5 +1,5 @@ Source: foonathan-memory
-Version: 2019-07-21
+Version: 2019-07-21-1
Description: STL compatible C++ memory allocator library
Homepage: https://foonathan.net/doc/memory/
Default-Features: tool
diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake index e813d4517..f8fdeea33 100644 --- a/ports/foonathan-memory/portfile.cmake +++ b/ports/foonathan-memory/portfile.cmake @@ -22,15 +22,17 @@ vcpkg_from_github( file(COPY ${COMP_SOURCE_PATH}/comp_base.cmake DESTINATION ${SOURCE_PATH}/cmake/comp)
-vcpkg_check_features(tool FOONATHAN_MEMORY_BUILD_TOOLS)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ tool FOONATHAN_MEMORY_BUILD_TOOLS
+)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
+ ${FEATURE_OPTIONS}
-DFOONATHAN_MEMORY_BUILD_EXAMPLES=OFF
-DFOONATHAN_MEMORY_BUILD_TESTS=OFF
- -DFOONATHAN_MEMORY_BUILD_TOOLS=${FOONATHAN_MEMORY_BUILD_TOOLS}
)
vcpkg_install_cmake()
@@ -94,14 +96,14 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/README.md
)
-if(FOONATHAN_MEMORY_BUILD_TOOLS)
- if(NOT VCPKG_CMAKE_SYSTEM_NAME OR
- VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- set(EXECUTABLE_SUFFIX ".exe")
- else()
- set(EXECUTABLE_SUFFIX "")
- endif()
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR
+ VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set(EXECUTABLE_SUFFIX ".exe")
+else()
+ set(EXECUTABLE_SUFFIX "")
+endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX})
file(COPY
${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}
DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}
|