diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-05-20 05:47:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 14:47:19 -0700 |
| commit | f23ebed76f0a6b13e2fe66f7a31ee744708d95b8 (patch) | |
| tree | 7fb99351a9c54cef8027ab721c16c9998be21cca /ports/cpuid | |
| parent | 9e03a3ac59797fcee9e0670d5e002b3a2a78ac44 (diff) | |
| download | vcpkg-f23ebed76f0a6b13e2fe66f7a31ee744708d95b8.tar.gz vcpkg-f23ebed76f0a6b13e2fe66f7a31ee744708d95b8.zip | |
[cmake] Update to 3.17.2 (#10767)
* [cmake] Update to 3.17.1
* update cmake directory name
* [cpuid] Fix install headers.
* [stormlib] Fix install headers
* [murmurhash] Fix install headers
* [metrohash] Fix install headers
* update baseline
* update baseline
* [otl] update hash
* update baseline
* [gts] Do not use ninja to avoid empty implib issue
* update baseline
* [dmlc] Re-trigger ci test
* [replxx] Re-trigger ci test
* update baseline
* [osg] Re-trigger ci test
* [replxx] Fix build failure
* Set cmake min version to 3.17.1
* update baseline
* [libnice] Re-trigger ci test
* [mlpack] Re-trigger ci test
* update to 3.17.2
* update cmake hash
* update baseline
* update baseline
* update baseline
* update baseline
* Update scripts/ci.baseline.txt
Co-authored-by: Billy O'Neal <billy.oneal@gmail.com>
* update baseline
* update baseline
* [magnum] Set magnum:arm64-windows to skip in baseline
* [nanogui] Set nanogui:arm64-windows to fail in baseline
* [nettle] Set nettle:x64-windows to fail, waiting for fix this issue in another PR
* re-trigger CI test
* update baseline
* Install unixODBC in Linux
* [nanodbc] Re-trigger CI test
* update baseline
* Remove space
* update baseline
Diffstat (limited to 'ports/cpuid')
| -rw-r--r-- | ports/cpuid/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cpuid/fix-install-headers.patch | 13 | ||||
| -rw-r--r-- | ports/cpuid/portfile.cmake | 11 |
3 files changed, 20 insertions, 6 deletions
diff --git a/ports/cpuid/CONTROL b/ports/cpuid/CONTROL index 84209185f..8445533af 100644 --- a/ports/cpuid/CONTROL +++ b/ports/cpuid/CONTROL @@ -1,5 +1,5 @@ Source: cpuid -Version: 0.4.1 +Version: 0.4.1-1 Homepage: https://github.com/anrieff/libcpuid Description: Provides CPU identification for the x86 (and x86_64) Supports: x86 | x64 diff --git a/ports/cpuid/fix-install-headers.patch b/ports/cpuid/fix-install-headers.patch new file mode 100644 index 000000000..d5c9c8641 --- /dev/null +++ b/ports/cpuid/fix-install-headers.patch @@ -0,0 +1,13 @@ +diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt +index 96533ac..d71953f 100644 +--- a/libcpuid/CMakeLists.txt ++++ b/libcpuid/CMakeLists.txt +@@ -75,7 +75,7 @@ install(TARGETS cpuid + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + RUNTIME DESTINATION "bin" +- INCLUDES DESTINATION "include") ++ PUBLIC_HEADER DESTINATION "include") + + install(FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}" diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake index 70f80d70f..48849dc0f 100644 --- a/ports/cpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -2,11 +2,12 @@ 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 + OUT_SOURCE_PATH SOURCE_PATH + REPO anrieff/libcpuid + REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0 + SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d + HEAD_REF master + PATCHES fix-install-headers.patch ) vcpkg_configure_cmake( |