mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 04:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[foonathan-memory] Fix using vcpkg_check_features error (#8266)

Browse Source
This commit is contained in:
Cheney Wang 2019-09-21 02:29:10 +08:00 committed by Phil Christensen
parent bb171a0ffc
commit 0279fd5ad2
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/foonathan-memory/CONTROL
View File

@ -1,5 +1,5 @@
Source: foonathan-memory Source: foonathan-memory
Version: 2019-07-21 Version: 2019-07-21-1
Description: STL compatible C++ memory allocator library Description: STL compatible C++ memory allocator library
Homepage: https://foonathan.net/doc/memory/ Homepage: https://foonathan.net/doc/memory/
Default-Features: tool Default-Features: tool

14
ports/foonathan-memory/portfile.cmake
View File

@ -22,15 +22,17 @@ vcpkg_from_github(
file(COPY ${COMP_SOURCE_PATH}/comp_base.cmake DESTINATION ${SOURCE_PATH}/cmake/comp) 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( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
OPTIONS OPTIONS
${FEATURE_OPTIONS}
-DFOONATHAN_MEMORY_BUILD_EXAMPLES=OFF -DFOONATHAN_MEMORY_BUILD_EXAMPLES=OFF
-DFOONATHAN_MEMORY_BUILD_TESTS=OFF -DFOONATHAN_MEMORY_BUILD_TESTS=OFF
-DFOONATHAN_MEMORY_BUILD_TOOLS=${FOONATHAN_MEMORY_BUILD_TOOLS}
) )
vcpkg_install_cmake() vcpkg_install_cmake()
@ -94,14 +96,14 @@ file(REMOVE
${CURRENT_PACKAGES_DIR}/README.md ${CURRENT_PACKAGES_DIR}/README.md
) )
if(FOONATHAN_MEMORY_BUILD_TOOLS) if(NOT VCPKG_CMAKE_SYSTEM_NAME OR
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR
VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(EXECUTABLE_SUFFIX ".exe") set(EXECUTABLE_SUFFIX ".exe")
else() else()
set(EXECUTABLE_SUFFIX "") set(EXECUTABLE_SUFFIX "")
endif() endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX})
file(COPY file(COPY
${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}
DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}