3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[libsodium/darts-clone] remove conflicting makefile (#6875)

Browse Source 
* [libsodium/darts-clone] remove conflicting makefile
This commit is contained in:
Phil Christensen 2019-06-12 21:39:10 -07:00 committed by GitHub
parent e1d5827666
commit 58e0d4029e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/darts-clone/CONTROL
View File

@ -1,3 +1,3 @@
Source: darts-clone Source: darts-clone
Version: 1767ab87cffe Version: 1767ab87cffe-1
Description: A static double-array trie structure Description: A static double-array trie structure

2
ports/darts-clone/portfile.cmake
View File

@ -23,4 +23,6 @@ vcpkg_configure_cmake(
vcpkg_install_cmake() vcpkg_install_cmake()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)
file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright) file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright)

2
ports/libsodium/CONTROL
View File

@ -1,3 +1,3 @@
Source: libsodium Source: libsodium
Version: 1.0.17-2 Version: 1.0.17-3
Description: A modern and easy-to-use crypto library Description: A modern and easy-to-use crypto library

2
ports/libsodium/portfile.cmake
View File

@ -40,6 +40,8 @@ file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/include
) )
file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string( vcpkg_replace_string(
${CURRENT_PACKAGES_DIR}/include/sodium/export.h ${CURRENT_PACKAGES_DIR}/include/sodium/export.h