[librabbitmq] update to 0.14.0 (#37747)

This commit is contained in:
JonLiu1993 2024-03-27 15:37:20 -07:00 committed by GitHub
parent ec04628385
commit 8c247a8e24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 40 additions and 78 deletions

View File

@ -1,41 +0,0 @@
diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt
index 671840b..b46614c 100644
--- a/librabbitmq/CMakeLists.txt
+++ b/librabbitmq/CMakeLists.txt
@@ -112,11 +112,25 @@ add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS)
set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT})
+set(PUBLIC_INCLUDE_DIRS
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:include>
+)
+
+set(PRIVATE_INCLUDE_DIRS
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
if (BUILD_SHARED_LIBS)
add_library(rabbitmq SHARED ${RABBITMQ_SOURCES})
target_link_libraries(rabbitmq ${RMQ_LIBRARIES})
+ target_include_directories(rabbitmq
+ PUBLIC ${PUBLIC_INCLUDE_DIRS}
+ PRIVATE ${PRIVATE_INCLUDE_DIRS}
+ )
if (WIN32)
set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION})
else (WIN32)
@@ -137,6 +151,10 @@ if (BUILD_STATIC_LIBS)
target_link_libraries(rabbitmq-static ${RMQ_LIBRARIES})
+ target_include_directories(rabbitmq-static
+ PUBLIC ${PUBLIC_INCLUDE_DIRS}
+ PRIVATE ${PRIVATE_INCLUDE_DIRS}
+ )
set_target_properties(rabbitmq-static PROPERTIES COMPILE_DEFINITIONS AMQP_STATIC)
if (WIN32)
set_target_properties(rabbitmq-static PROPERTIES

View File

@ -1,28 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b353be6..419e983 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,6 +150,10 @@ else()
endif()
endif()
+if(MSVC)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
+endif()
+
option(REGENERATE_AMQP_FRAMING "Regenerate amqp_framing.h/amqp_framing.c sources (for developer use)" OFF)
mark_as_advanced(REGENERATE_AMQP_FRAMING)
diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt
index d8dcd26..671840b 100644
--- a/librabbitmq/CMakeLists.txt
+++ b/librabbitmq/CMakeLists.txt
@@ -108,7 +108,7 @@ set(RABBITMQ_SOURCES
${AMQP_SSL_SRCS}
)
-add_definitions(-DAMQP_BUILD)
+add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS)
set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c88943f..4fc1411 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,10 @@ if(PROJECT_IS_TOP_LEVEL)
include(CTest)
endif()
+if(MSVC)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
+endif()
+
option(BUILD_SHARED_LIBS "Build rabbitmq-c as a shared library" ON)
option(BUILD_STATIC_LIBS "Build rabbitmq-c as a static library" ON)
option(INSTALL_STATIC_LIBS "Install rabbitmq-c static library" ON)
diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt
index 4466c9f..e8825dd 100644
--- a/librabbitmq/CMakeLists.txt
+++ b/librabbitmq/CMakeLists.txt
@@ -64,6 +64,8 @@ set(RMQ_SOURCES
amqp_url.c
)
+add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS)
+
set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT})
if(BUILD_SHARED_LIBS)

View File

@ -1,12 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alanxz/rabbitmq-c
REF v0.11.0
SHA512 0c3dbb6e2b862e9f25e3f76df798ea272bbd81de2865950b95adf1f1e5791eb20d7c9d5a76cb7d2fda54bad5f12bdf69cbfa7e9fd1afdede6f9ec729ca2287de
REF "v${VERSION}"
SHA512 18cb429bcfa457e359128bf458c8b9f60b1c929a8ca3a8206f40d6390d7d4c6f4c5140eb7e9ab7b401d035fc48324cbe963d058100ab65ef3faba59e7f95607e
HEAD_REF master
PATCHES
fix-uwpwarning.patch
fix-link-header-files.patch #Remove this patch in the next version
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@ -15,7 +14,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTS=OFF
-DBUILD_TESTING=OFF
-DBUILD_TOOLS=OFF
-DBUILD_STATIC_LIBS=${BUILD_STATIC}
)
@ -30,4 +29,4 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,7 +1,6 @@
{
"name": "librabbitmq",
"version": "0.11.0",
"port-version": 2,
"version": "0.14.0",
"description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.",
"homepage": "https://github.com/alanxz/rabbitmq-c",
"license": "MIT",

View File

@ -4829,8 +4829,8 @@
"port-version": 0
},
"librabbitmq": {
"baseline": "0.11.0",
"port-version": 2
"baseline": "0.14.0",
"port-version": 0
},
"libraqm": {
"baseline": "0.10.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "02f81a2c57c6f0c36f4f504c85fa23897c566f8e",
"version": "0.14.0",
"port-version": 0
},
{
"git-tree": "eaa23b49b84d0ec45e28645d78adc6c0b2f8faed",
"version": "0.11.0",