diff options
| author | Carlos O'Ryan <coryan@users.noreply.github.com> | 2018-10-20 13:19:50 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-20 13:19:50 -0700 |
| commit | 12a0a9989b5434afde67690737a364d10f60a1b9 (patch) | |
| tree | 6ced01c678abfe4cbbdfd27e19c5a92a028f2fec | |
| parent | 2e0338ce934129d0cfb79157b5aae566a12bc38c (diff) | |
| download | vcpkg-12a0a9989b5434afde67690737a364d10f60a1b9.tar.gz vcpkg-12a0a9989b5434afde67690737a364d10f60a1b9.zip | |
Fix crc32c CMake configuration directory. (#4509)
* Fix crc32c CMake configuration directory.
The port was installing the CMake configuration files for Crc32c in
share/crc32c/Crc32c/Crc32cConfig.cmake, where find_package() cannot
find them. They should be installed in share/crc32c/Crc32cConfig.cmake.
* [crc32] Lowercase share directory
| -rw-r--r-- | ports/crc32c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/crc32c/portfile.cmake | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/ports/crc32c/CONTROL b/ports/crc32c/CONTROL index 77a7e42c9..20786bad2 100644 --- a/ports/crc32c/CONTROL +++ b/ports/crc32c/CONTROL @@ -1,3 +1,3 @@ Source: crc32c -Version: 1.0.5 +Version: 1.0.5-1 Description: CRC32C implementation with support for CPU-specific acceleration instructions. diff --git a/ports/crc32c/portfile.cmake b/ports/crc32c/portfile.cmake index 2747d69bd..a60f37671 100644 --- a/ports/crc32c/portfile.cmake +++ b/ports/crc32c/portfile.cmake @@ -1,9 +1,6 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(WARNING "building static") - set(VCPKG_LIBRARY_LINKAGE static) -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -13,24 +10,23 @@ vcpkg_from_github( HEAD_REF master ) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DCRC32C_BUILD_TESTS=OFF - -DCRC32C_BUILD_BENCHMARKS=OFF - -DCRC32C_USE_GLOG=OFF + -DCRC32C_BUILD_TESTS=OFF + -DCRC32C_BUILD_BENCHMARKS=OFF + -DCRC32C_USE_GLOG=OFF ) vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake") +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Crc32c") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() |