diff options
| author | myd7349 <myd7349@gmail.com> | 2020-05-02 06:28:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 15:28:55 -0700 |
| commit | 0ab1a9e1c64a3968631b59647e771beda7d1f256 (patch) | |
| tree | 5b4ff6d1fe12b2a6fcd0e560438e23289fe9ce13 /ports/cpuinfo | |
| parent | bc7d178e62c68adffc84ef8459eecde4a5ed5315 (diff) | |
| download | vcpkg-0ab1a9e1c64a3968631b59647e771beda7d1f256.tar.gz vcpkg-0ab1a9e1c64a3968631b59647e771beda7d1f256.zip | |
[vcpkg] Add new function vcpkg_copy_tools (#8749)
* [vcpkg] Add new function vcpkg_copy_tools
* [cpuinfo][czmq][nanomsg][uriparser] Use vcpkg_copy_tools
* [czmq] Clean even tools are not copied
[libsvm][zyre] Use vcpkg_copy_tools
* [vcpkg-copy-tools] Clean debug/bin
This should fix czmq build error
* [czmq] czmq does not have BUILD_TOOLS option
* [vcpkg] Split clean logic into another function
* [cpuinfo][czmq][nanomsg][uriparser] Fix calling of vcpkg_copy_tools
* [zyre] Fix regression error
* [vcpkg] Update try_remove_empty_directory
* [libsvm] Fix vcpkg_copy_tools call
Diffstat (limited to 'ports/cpuinfo')
| -rw-r--r-- | ports/cpuinfo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cpuinfo/portfile.cmake | 17 |
2 files changed, 5 insertions, 14 deletions
diff --git a/ports/cpuinfo/CONTROL b/ports/cpuinfo/CONTROL index 180b26043..0c349078e 100644 --- a/ports/cpuinfo/CONTROL +++ b/ports/cpuinfo/CONTROL @@ -1,5 +1,5 @@ Source: cpuinfo
-Version: 2019-07-28
+Version: 2019-07-28-1
Description: CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)
Homepage: https://github.com/pytorch/cpuinfo
diff --git a/ports/cpuinfo/portfile.cmake b/ports/cpuinfo/portfile.cmake index b5279e30d..9b3db8e45 100644 --- a/ports/cpuinfo/portfile.cmake +++ b/ports/cpuinfo/portfile.cmake @@ -47,19 +47,10 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(tools IN_LIST FEATURES)
- foreach(cpuinfo_tool cache-info cpuid-dump cpu-info isa-info)
- file(COPY
- ${CURRENT_PACKAGES_DIR}/bin/${cpuinfo_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}
- DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}
- )
- vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
- endforeach()
-
- if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
- else()
- # TODO: Fix it once this lib supports dynamic building.
- endif()
+ vcpkg_copy_tools(
+ TOOL_NAMES cache-info cpuid-dump cpu-info isa-info
+ AUTO_CLEAN
+ )
endif()
# Handle copyright
|