3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

Single config fixes 2. (#27406)

Browse Source 
* freerdp fix single config

* libassuan fix single config builds

* libcanberra fix single config build

* libmysql fix single config builds

* libobd fix single config

* libusb allow single config wrapper

* nmap single config cleanup

* spdk single config stuff

* zeroc-ice fix single config

* zopfli single config fix

* use version date

* v db

* Revert unchanged libodb-pgsql port-version bump.

Co-authored-by: Billy O'Neal <bion@microsoft.com>
This commit is contained in:
Alexander Neumann 2022-10-26 19:55:31 +02:00 committed by GitHub
parent 44135c3103
commit 16a892c1fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 254 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ports/freerdp/portfile.cmake
View File

@ -51,7 +51,6 @@ file(GLOB_RECURSE TOOLS_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*.exe")
if(TOOLS_RELEASE)
file(COPY ${TOOLS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(GLOB_RECURSE TOOLS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG})
endif()
@ -65,11 +64,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(REMOVE "${FREERDP_DLL}")
endforeach()
file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
foreach(FREERDP_DLL ${FREERDP_DLLS})
file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
file(REMOVE "${FREERDP_DLL}")
endforeach()
if(NOT VCPKG_BUILD_TYPE)
file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
foreach(FREERDP_DLL ${FREERDP_DLLS})
file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
file(REMOVE "${FREERDP_DLL}")
endforeach()
endif()
else()
file(GLOB_RECURSE FREERDP_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
foreach(FREERDP_TOOL ${FREERDP_TOOLS})
@ -82,8 +83,10 @@ endif()
foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
if(NOT VCPKG_BUILD_TYPE)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
endif()
endforeach()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 PACKAGE_NAME FreeRDP-Client)
@ -92,14 +95,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 PACKAGE_NAME W
vcpkg_fixup_pkgconfig(SKIP_CHECK)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
"debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
"debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
"debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
"debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake"
"lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
@ -108,18 +113,22 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.c
"lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake"
"debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake"
"debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-release.cmake"
"lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake"
"debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake"
"debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-release.cmake"
"lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"

1
ports/freerdp/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "freerdp",
"version": "2.7.0",
"port-version": 1,
"description": "A free implementation of the Remote Desktop Protocol (RDP)",
"homepage": "https://github.com/FreeRDP/FreeRDP",
"license": "Apache-2.0",

4
ports/libassuan/portfile.cmake
View File

@ -23,7 +23,9 @@ vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/debug/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/debug/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/libassuan/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libassuan",
"version": "2.5.3",
"port-version": 4,
"port-version": 5,
"description": "A library implementing the so-called Assuan protocol",
"homepage": "https://gnupg.org/software/libassuan/index.html",
"supports": "!windows",

9
ports/libmysql/portfile.cmake
View File

@ -99,11 +99,14 @@ endif()
vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN)
file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${PORT}")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share")
file(RENAME "${CURRENT_PACKAGES_DIR}/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}")
if(NOT VCPKG_BUILD_TYPE)
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}")
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql CONFIG_PATH share/${PORT}/unofficial-libmysql)

2
ports/libmysql/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libmysql",
"version": "8.0.20",
"port-version": 8,
"port-version": 9,
"description": "A MySQL client library for C development",
"homepage": "https://github.com/mysql/mysql-server",
"license": "GPL-2.0-or-later",

22
ports/libodb-boost/portfile.cmake
View File

@ -6,17 +6,17 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
ARCHIVE "${ARCHIVE}"
)
file(REMOVE "${SOURCE_PATH}/version")
file(COPY
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
DESTINATION ${SOURCE_PATH})
"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
"${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in"
DESTINATION "${SOURCE_PATH}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS_DEBUG
-DLIBODB_INSTALL_HEADERS=OFF
@ -25,10 +25,12 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake LIBODB_DEBUG_TARGETS)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_boostConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}")
if(NOT VCPKG_BUILD_TYPE)
file(READ "${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake" LIBODB_DEBUG_TARGETS)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/odb/odb_boostConfig-debug.cmake" "${LIBODB_DEBUG_TARGETS}")
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

4
ports/libodb-boost/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libodb-boost",
"version-string": "2.4.0",
"port-version": 5,
"version": "2.4.0",
"port-version": 6,
"description": "Description: Boost support for the ODB ORM library",
"dependencies": [
"libodb"

16
ports/libodb-mysql/portfile.cmake
View File

@ -5,7 +5,7 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive_ex(
ARCHIVE ${ARCHIVE}
ARCHIVE "${ARCHIVE}"
OUT_SOURCE_PATH SOURCE_PATH
PATCHES
adapter_mysql_8.0.patch
@ -14,16 +14,16 @@ vcpkg_extract_source_archive_ex(
file(REMOVE "${SOURCE_PATH}/version")
file(COPY
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
DESTINATION ${SOURCE_PATH})
"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
"${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in"
DESTINATION "${SOURCE_PATH}")
set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql")
find_library(MYSQL_LIB NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH REQUIRED)
find_library(MYSQL_LIB_DEBUG NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH REQUIRED)
find_library(MYSQL_LIB_DEBUG NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
@ -41,5 +41,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/odb TARGET_PATH share/odb)
vcpkg_copy_pdbs()
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/libodb-mysql/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libodb-mysql",
"version": "2.4.0",
"port-version": 9,
"port-version": 10,
"description": "MySQL support for the ODB ORM library",
"homepage": "https://www.codesynthesis.com/products/odb/",
"dependencies": [

22
ports/libodb-sqlite/portfile.cmake
View File

@ -6,17 +6,17 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
ARCHIVE "${ARCHIVE}"
)
file(REMOVE "${SOURCE_PATH}/version")
file(COPY
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
DESTINATION ${SOURCE_PATH})
"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
"${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in"
DESTINATION "${SOURCE_PATH}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS_DEBUG
-DLIBODB_INSTALL_HEADERS=OFF
@ -24,11 +24,13 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake LIBODB_DEBUG_TARGETS)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
if(NOT VCPKG_BUILD_TYPE)
file(READ "${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake" LIBODB_DEBUG_TARGETS)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake" "${LIBODB_DEBUG_TARGETS}")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
endif()
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

4
ports/libodb-sqlite/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libodb-sqlite",
"version-string": "2.4.0",
"port-version": 9,
"version": "2.4.0",
"port-version": 10,
"description": "Sqlite support for the ODB ORM library",
"homepage": "https://www.codesynthesis.com/products/odb/",
"dependencies": [

8
ports/libodb/portfile.cmake
View File

@ -26,9 +26,11 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}")
if(NOT VCPKG_BUILD_TYPE)
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}")
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/odbConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/odb)
write_basic_package_version_file(${CURRENT_PACKAGES_DIR}/share/odb/odbConfigVersion.cmake

2
ports/libodb/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libodb",
"version": "2.4.0",
"port-version": 8,
"port-version": 9,
"description": "ODB library, base runtime for the ODB ORM solution",
"homepage": "https://www.codesynthesis.com/products/odb/"
}

7
ports/libusb/vcpkg-cmake-wrapper.cmake
View File

@ -1,13 +1,12 @@
include(SelectLibraryConfigurations)
find_path(LIBUSB_INCLUDE_DIR libusb.h PATH_SUFFIXES libusb-1.0)
find_library(LIBUSB_LIBRARY_DEBUG NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
find_library(LIBUSB_LIBRARY_RELEASE NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
find_library(LIBUSB_LIBRARY_DEBUG NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
find_library(LIBUSB_LIBRARY_RELEASE NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
select_library_configurations(LIBUSB)
set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR})
set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY})
set(LIBUSB_INCLUDE_DIRS "${LIBUSB_INCLUDE_DIR}")
if (@VCPKG_TARGET_IS_LINUX@)
list(APPEND LIBUSB_LIBRARIES udev)

2
ports/libusb/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libusb",
"version": "1.0.26",
"port-version": 1,
"port-version": 2,
"description": "a cross-platform library to access USB devices",
"homepage": "https://github.com/libusb/libusb",
"license": "LGPL-2.1",

48
ports/nmap/portfile.cmake
View File

@ -61,32 +61,30 @@ else()
set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR})
message(STATUS "Building Options: ${OPTIONS}")
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Release)
# Since nmap makefile has strong relationshop with codes, copy codes to obj path
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
vcpkg_extract_source_archive(source_path_release
ARCHIVE "${ARCHIVE}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
)
# Since nmap makefile has strong relationshop with codes, copy codes to obj path
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
vcpkg_extract_source_archive(source_path_release
ARCHIVE "${ARCHIVE}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
)
vcpkg_execute_required_process(
COMMAND "./configure" ${OPTIONS}
WORKING_DIRECTORY "${source_path_release}"
LOGNAME config-${TARGET_TRIPLET}-rel
)
message(STATUS "Building ${TARGET_TRIPLET}-rel")
vcpkg_execute_required_process(
COMMAND make
WORKING_DIRECTORY "${source_path_release}"
LOGNAME build-${TARGET_TRIPLET}-rel
)
message(STATUS "Installing ${TARGET_TRIPLET}-rel")
file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
endif()
vcpkg_execute_required_process(
COMMAND "./configure" ${OPTIONS}
WORKING_DIRECTORY "${source_path_release}"
LOGNAME config-${TARGET_TRIPLET}-rel
)
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug)
message(STATUS "Building ${TARGET_TRIPLET}-rel")
vcpkg_execute_required_process(
COMMAND make
WORKING_DIRECTORY "${source_path_release}"
LOGNAME build-${TARGET_TRIPLET}-rel
)
message(STATUS "Installing ${TARGET_TRIPLET}-rel")
file(INSTALL "${source_path_release}/nmap" DESTINATION "${CURRENT_PACKAGES_DIR}/tools")
if (NOT VCPKG_BUILD_TYPE)
# Since nmap makefile has strong relationshop with codes, copy codes to obj path
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
vcpkg_extract_source_archive(source_path_debug
@ -117,4 +115,4 @@ endif()
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/nmap/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "nmap",
"version": "7.70",
"port-version": 6,
"port-version": 7,
"description": "A library for scanning network ports.",
"dependencies": [
{

4
ports/spdk-dpdk/portfile.cmake
View File

@ -36,7 +36,9 @@ FOREACH (HEADER ${HEADERS})
ENDFOREACH ()
FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk)
FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
if(NOT VCPKG_BUILD_TYPE)
FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
endif()
FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

4
ports/spdk-dpdk/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "spdk-dpdk",
"version-string": "20181124",
"port-version": 1,
"version-date": "2018-11-24",
"port-version": 2,
"description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing",
"supports": "linux"
}

4
ports/spdk-ipsec/portfile.cmake
View File

@ -49,7 +49,9 @@ VCPKG_CONFIGURE_CMAKE(
VCPKG_INSTALL_CMAKE()
FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk)
FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
if(NOT VCPKG_BUILD_TYPE)
FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
endif()
FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-ipsecConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

4
ports/spdk-ipsec/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "spdk-ipsec",
"version-string": "20180711",
"port-version": 1,
"version-date": "2018-07-11",
"port-version": 2,
"description": "SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library",
"supports": "x64 & linux"
}

72
ports/zeroc-ice/portfile.cmake
View File

@ -160,46 +160,46 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(ICE_BUILD_CONFIG "static cpp11-static")
endif()
if(NOT VCPKG_BUILD_TYPE)
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
vcpkg_execute_build_process(
COMMAND make
V=1
"prefix=${CURRENT_PACKAGES_DIR}/debug"
linux_id=vcpkg
"CONFIGS=${ICE_BUILD_CONFIG}"
USR_DIR_INSTALL=yes
OPTIMIZE=no
${ICE_OPTIONAL_COMPONENTS_MAKE}
"-j${VCPKG_CONCURRENCY}"
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
LOGNAME make-${TARGET_TRIPLET}-dbg
)
vcpkg_execute_build_process(
COMMAND make
V=1
"prefix=${CURRENT_PACKAGES_DIR}/debug"
linux_id=vcpkg
"CONFIGS=${ICE_BUILD_CONFIG}"
USR_DIR_INSTALL=yes
OPTIMIZE=no
${ICE_OPTIONAL_COMPONENTS_MAKE}
"-j${VCPKG_CONCURRENCY}"
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
LOGNAME make-${TARGET_TRIPLET}-dbg
)
# Install debug libraries to packages directory
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*")
else()
file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*")
endif()
file(COPY ${ICE_DEBUG_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
# Install debug libraries to packages directory
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*")
else()
file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*")
endif()
file(COPY ${ICE_DEBUG_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
# Clean up for the next round
vcpkg_execute_build_process(
COMMAND make distclean
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
LOGNAME make-clean-${TARGET_TRIPLET}
)
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib")
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib")
endif()
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64")
endif()
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin")
# Clean up for the next round
vcpkg_execute_build_process(
COMMAND make distclean
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
LOGNAME make-clean-${TARGET_TRIPLET}
)
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib")
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib")
endif()
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64")
endif()
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin")
endif() # TODO: get-cmake-vars!
# Release build
set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/lib")
message(STATUS "Building ${TARGET_TRIPLET}-rel")

2
ports/zeroc-ice/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "zeroc-ice",
"version": "3.7.7",
"port-version": 2,
"port-version": 3,
"maintainers": "Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>",
"description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.",
"homepage": "https://github.com/zeroc-ice/ice",

18
ports/zopfli/portfile.cmake
View File

@ -39,14 +39,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Zopfli")
# vcpkg_cmake_config_fixup can not handles this on UNIX currently.
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake"
"\"\${_IMPORT_PREFIX}/debug/bin/zopfli\""
"\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\""
)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake"
"\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\""
"\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\""
)
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake"
"\"\${_IMPORT_PREFIX}/debug/bin/zopfli\""
"\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\""
)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake"
"\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\""
"\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\""
)
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake"
"\"\${_IMPORT_PREFIX}/bin/zopfli\""
"\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\""

2
ports/zopfli/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "zopfli",
"version": "1.0.3",
"port-version": 2,
"port-version": 3,
"description": "Zopfli Compression Algorithm compression library programmed in C",
"homepage": "https://github.com/google/zopfli",
"license": "Apache-2.0",

30
versions/baseline.json
View File

@ -2438,7 +2438,7 @@
},
"freerdp": {
"baseline": "2.7.0",
"port-version": 0
"port-version": 1
},
"freetds": {
"baseline": "1.3.10",
@ -3562,7 +3562,7 @@
},
"libassuan": {
"baseline": "2.5.3",
"port-version": 4
"port-version": 5
},
"libatomic-ops": {
"baseline": "7.7.0",
@ -3986,7 +3986,7 @@
},
"libmysql": {
"baseline": "8.0.20",
"port-version": 8
"port-version": 9
},
"libnice": {
"baseline": "0.1.18",
@ -4002,15 +4002,15 @@
},
"libodb": {
"baseline": "2.4.0",
"port-version": 8
"port-version": 9
},
"libodb-boost": {
"baseline": "2.4.0",
"port-version": 5
"port-version": 6
},
"libodb-mysql": {
"baseline": "2.4.0",
"port-version": 9
"port-version": 10
},
"libodb-pgsql": {
"baseline": "2.4.0",
@ -4018,7 +4018,7 @@
},
"libodb-sqlite": {
"baseline": "2.4.0",
"port-version": 9
"port-version": 10
},
"libofx": {
"baseline": "0.10.9",
@ -4318,7 +4318,7 @@
},
"libusb": {
"baseline": "1.0.26",
"port-version": 1
"port-version": 2
},
"libusb-win32": {
"baseline": "1.2.6.0",
@ -5178,7 +5178,7 @@
},
"nmap": {
"baseline": "7.70",
"port-version": 6
"port-version": 7
},
"nmslib": {
"baseline": "2.1.1",
@ -7037,12 +7037,12 @@
"port-version": 2
},
"spdk-dpdk": {
"baseline": "20181124",
"port-version": 1
"baseline": "2018-11-24",
"port-version": 2
},
"spdk-ipsec": {
"baseline": "20180711",
"port-version": 1
"baseline": "2018-07-11",
"port-version": 2
},
"spdk-isal": {
"baseline": "2018-10-06",
@ -8186,7 +8186,7 @@
},
"zeroc-ice": {
"baseline": "3.7.7",
"port-version": 2
"port-version": 3
},
"zeromq": {
"baseline": "4.3.4",
@ -8214,7 +8214,7 @@
},
"zopfli": {
"baseline": "1.0.3",
"port-version": 2
"port-version": 3
},
"zpp-bits": {
"baseline": "4.4.12",

5
versions/f-/freerdp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "df30f0361e815375e25a9ef7c8ee4e1d353a1d07",
"version": "2.7.0",
"port-version": 1
},
{
"git-tree": "585cf904d3a8fe43723d72d8c20175a780e17a64",
"version": "2.7.0",

5
versions/l-/libassuan.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2d7ffbae178c6701fbe84afaa3f4656a210ca37b",
"version": "2.5.3",
"port-version": 5
},
{
"git-tree": "cf0ffd2dfbb239d338524fc0ea59311a869144c0",
"version": "2.5.3",

5
versions/l-/libmysql.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ee63ba895261bab75a62db6f77937f6a3381c43",
"version": "8.0.20",
"port-version": 9
},
{
"git-tree": "b0337316bdcf6acfc791eb6fac2c490db774b24e",
"version": "8.0.20",

5
versions/l-/libodb-boost.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "86151d98ef2379eb1b3aaa89e3970e9301bd9318",
"version": "2.4.0",
"port-version": 6
},
{
"git-tree": "0aad9c51faa7aef72cf64a8c09fbdb08cf677dbd",
"version-string": "2.4.0",

5
versions/l-/libodb-mysql.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c8969f77bfa4c1dd85950dc185f055f0b329aaec",
"version": "2.4.0",
"port-version": 10
},
{
"git-tree": "bf081744ced44cfa3da6d34d959a63fdaacaf69f",
"version": "2.4.0",

5
versions/l-/libodb-sqlite.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "effa726b187029b9af2856f55a9674bdd5232eb7",
"version": "2.4.0",
"port-version": 10
},
{
"git-tree": "4923ceb767ecc4c6f5efb7bcc80fafef19718bd2",
"version-string": "2.4.0",

5
versions/l-/libodb.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "47f3bba38809da85d3a11f1a57cf1dce92a0ab54",
"version": "2.4.0",
"port-version": 9
},
{
"git-tree": "8296035980f67a96a49e7277dc91149172555750",
"version": "2.4.0",

5
versions/l-/libusb.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0fde9742f99465a4029efa4b552f3c2ed276ec6a",
"version": "1.0.26",
"port-version": 2
},
{
"git-tree": "bd3501fc0abc3d7ce598175f8f7f593f642a4973",
"version": "1.0.26",

5
versions/n-/nmap.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce091d3154815b15982f0ec59e48d7d9a322f79b",
"version": "7.70",
"port-version": 7
},
{
"git-tree": "6d9e2e59a91c2ef33e59bb886accd8af1ac39b54",
"version": "7.70",

5
versions/s-/spdk-dpdk.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "05e56d1ca7edd701503c100d3660605a01416c84",
"version-date": "2018-11-24",
"port-version": 2
},
{
"git-tree": "a67cfb564274aa985ef274b6f8a1fac8591b5445",
"version-string": "20181124",

5
versions/s-/spdk-ipsec.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8acd8deb0597e3534db4e5c9fc37a1ffb72e2f59",
"version-date": "2018-07-11",
"port-version": 2
},
{
"git-tree": "bf8024ae19962088f98418e2487147aa14d4df95",
"version-string": "20180711",

5
versions/z-/zeroc-ice.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e57483820c975a5418fcd98645c7d1315dd8bced",
"version": "3.7.7",
"port-version": 3
},
{
"git-tree": "1ddc4746c1f19fca41706071fac4575ea99fe6b9",
"version": "3.7.7",

5
versions/z-/zopfli.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a420507011746898644df907f97d7ab467d3ebd6",
"version": "1.0.3",
"port-version": 3
},
{
"git-tree": "a0451fdd88ef4beba9c0f572d219c0148ac28a25",
"version": "1.0.3",