зеркало из https://github.com/microsoft/vcpkg.git
[activemq-cpp] switch msbuild (#33090)
* [activemq-cpp] use vcpkg-msbuild * v db * Fix paths * v db
This commit is contained in:
Родитель
a96751d8f3
Коммит
fb791ab055
|
@ -73,32 +73,27 @@ else()
|
||||||
vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClCompile Include=\"..\\src" "ClCompile Include=\"${WIN_SOURCE_PATH}\\src")
|
vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClCompile Include=\"..\\src" "ClCompile Include=\"${WIN_SOURCE_PATH}\\src")
|
||||||
vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClInclude Include=\"..\\src" "ClInclude Include=\"${WIN_SOURCE_PATH}\\src")
|
vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClInclude Include=\"..\\src" "ClInclude Include=\"${WIN_SOURCE_PATH}\\src")
|
||||||
vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "../src/main" "${WIN_SOURCE_PATH}\\src\\main")
|
vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "../src/main" "${WIN_SOURCE_PATH}\\src\\main")
|
||||||
vcpkg_install_msbuild(
|
vcpkg_msbuild_install(
|
||||||
SOURCE_PATH "${SOURCE_PATH}/vs2010-build"
|
SOURCE_PATH "${SOURCE_PATH}/vs2010-build"
|
||||||
PROJECT_SUBPATH "activemq-cpp.vcxproj"
|
PROJECT_SUBPATH "activemq-cpp.vcxproj"
|
||||||
RELEASE_CONFIGURATION ${RELEASE_CONF}
|
RELEASE_CONFIGURATION ${RELEASE_CONF}
|
||||||
DEBUG_CONFIGURATION ${DEBUG_CONF}
|
DEBUG_CONFIGURATION ${DEBUG_CONF}
|
||||||
PLATFORM ${BUILD_ARCH}
|
PLATFORM ${BUILD_ARCH}
|
||||||
USE_VCPKG_INTEGRATION
|
|
||||||
ALLOW_ROOT_INCLUDES
|
|
||||||
SKIP_CLEAN
|
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_copy_pdbs()
|
|
||||||
|
|
||||||
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
file(COPY
|
file(COPY
|
||||||
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp.lib"
|
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${BUILD_ARCH}/${RELEASE_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp.lib"
|
||||||
DESTINATION "${CURRENT_PACKAGES_DIR}/lib"
|
DESTINATION "${CURRENT_PACKAGES_DIR}/lib"
|
||||||
)
|
)
|
||||||
|
|
||||||
if (ACTIVEMQCPP_SHARED_LIB)
|
if (ACTIVEMQCPP_SHARED_LIB)
|
||||||
file(COPY
|
file(COPY
|
||||||
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.dll"
|
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.dll"
|
||||||
DESTINATION "${CURRENT_PACKAGES_DIR}/bin"
|
DESTINATION "${CURRENT_PACKAGES_DIR}/bin"
|
||||||
)
|
)
|
||||||
file(COPY
|
file(COPY
|
||||||
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.pdb"
|
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.pdb"
|
||||||
DESTINATION "${CURRENT_PACKAGES_DIR}/bin"
|
DESTINATION "${CURRENT_PACKAGES_DIR}/bin"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
@ -106,17 +101,17 @@ else()
|
||||||
|
|
||||||
if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
file(COPY
|
file(COPY
|
||||||
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib"
|
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib"
|
||||||
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib"
|
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ACTIVEMQCPP_SHARED_LIB)
|
if(ACTIVEMQCPP_SHARED_LIB)
|
||||||
file(COPY
|
file(COPY
|
||||||
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll"
|
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll"
|
||||||
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin"
|
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin"
|
||||||
)
|
)
|
||||||
file(COPY
|
file(COPY
|
||||||
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.pdb"
|
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.pdb"
|
||||||
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin"
|
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
@ -125,10 +120,9 @@ else()
|
||||||
file(COPY "${SOURCE_PATH}/src/main/activemq" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
|
file(COPY "${SOURCE_PATH}/src/main/activemq" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
|
||||||
file(COPY "${SOURCE_PATH}/src/main/cms" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
|
file(COPY "${SOURCE_PATH}/src/main/cms" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
|
||||||
file(COPY "${SOURCE_PATH}/src/main/decaf" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
|
file(COPY "${SOURCE_PATH}/src/main/decaf" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
|
||||||
vcpkg_clean_msbuild()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
vcpkg_fixup_pkgconfig()
|
vcpkg_fixup_pkgconfig()
|
||||||
|
|
||||||
file(INSTALL "${CURRENT_PORT_DIR}/activemq-cppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/activemq-cpp")
|
file(INSTALL "${CURRENT_PORT_DIR}/activemq-cppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/activemq-cpp")
|
||||||
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "activemq-cpp",
|
"name": "activemq-cpp",
|
||||||
"version-semver": "3.9.5",
|
"version-semver": "3.9.5",
|
||||||
"port-version": 14,
|
"port-version": 15,
|
||||||
"description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
|
"description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"supports": "!(uwp | osx)",
|
"supports": "!(uwp | osx)",
|
||||||
|
@ -10,6 +10,11 @@
|
||||||
{
|
{
|
||||||
"name": "libuuid",
|
"name": "libuuid",
|
||||||
"platform": "!windows & !osx"
|
"platform": "!windows & !osx"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "vcpkg-msbuild",
|
||||||
|
"host": true,
|
||||||
|
"platform": "windows"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "c1aa825d176f58217f5fe94a3386923ffe2f924e",
|
||||||
|
"version-semver": "3.9.5",
|
||||||
|
"port-version": 15
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "7af309821bf9e2fdfaaf67e38eae1a073b4d1acc",
|
"git-tree": "7af309821bf9e2fdfaaf67e38eae1a073b4d1acc",
|
||||||
"version-semver": "3.9.5",
|
"version-semver": "3.9.5",
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
},
|
},
|
||||||
"activemq-cpp": {
|
"activemq-cpp": {
|
||||||
"baseline": "3.9.5",
|
"baseline": "3.9.5",
|
||||||
"port-version": 14
|
"port-version": 15
|
||||||
},
|
},
|
||||||
"ada-url": {
|
"ada-url": {
|
||||||
"baseline": "2.6.0",
|
"baseline": "2.6.0",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче