diff options
| author | tarcila <tarcila@users.noreply.github.com> | 2019-06-25 02:21:30 -0400 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-24 23:21:30 -0700 |
| commit | 54b3be6b60466370d37edbe64fb6c6ede8487f04 (patch) | |
| tree | a6b420c4790b39c139806e538b17acb2ba260b8e /ports | |
| parent | ecc4b1631f7e3252a8b84ab7564c83ecda8a6763 (diff) | |
| download | vcpkg-54b3be6b60466370d37edbe64fb6c6ede8487f04.tar.gz vcpkg-54b3be6b60466370d37edbe64fb6c6ede8487f04.zip | |
[scripts] Fix vcpkg_fixup_cmake on non Windows platforms (#5630)
* [scripts] Fix vcpkg_fixup_cmake on non Windows platforms
Script was only handling tools executables ending with .exe.
Changed it so anything under /bin/ in transformed.
This fixes for instance FlatcTargets-release.cmake from flatbuffers
port on osx.
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/grpc/portfile.cmake | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index b71a55420..2dca1c34c 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -63,7 +63,7 @@ vcpkg_configure_cmake( -DgRPC_GFLAGS_PROVIDER=none -DgRPC_BENCHMARK_PROVIDER=none -DgRPC_INSTALL_CSHARP_EXT=OFF - -DgRPC_INSTALL_BINDIR:STRING=bin + -DgRPC_INSTALL_BINDIR:STRING=tools/grpc -DgRPC_INSTALL_LIBDIR:STRING=lib -DgRPC_INSTALL_INCLUDEDIR:STRING=include -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc @@ -76,22 +76,11 @@ vcpkg_fixup_cmake_targets() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/grpc RENAME copyright) -# Install tools -file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe") -if(TOOLS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/grpc) - file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/grpc) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/grpc) -endif() - -file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") -if(EXES) - file(REMOVE ${EXES}) -endif() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/grpc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") # Ignore the C# extension DLL in bin/ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -## |