From 8e71b4813d79bdf3b1148e6d25bd6a406695978a Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 14 Jun 2022 00:00:57 -0700 Subject: [PATCH 01/12] fix usage include files --- ports/librabbitmq/fix-usage-include-file.patch | 13 +++++++++++++ ports/librabbitmq/portfile.cmake | 1 + ports/librabbitmq/vcpkg.json | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/librabbitmq/fix-usage-include-file.patch diff --git a/ports/librabbitmq/fix-usage-include-file.patch b/ports/librabbitmq/fix-usage-include-file.patch new file mode 100644 index 00000000000000..778fa2d8b95ac0 --- /dev/null +++ b/ports/librabbitmq/fix-usage-include-file.patch @@ -0,0 +1,13 @@ +diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt +index 671840b..fe5713b 100644 +--- a/librabbitmq/CMakeLists.txt ++++ b/librabbitmq/CMakeLists.txt +@@ -116,7 +116,7 @@ if (BUILD_SHARED_LIBS) + add_library(rabbitmq SHARED ${RABBITMQ_SOURCES}) + + target_link_libraries(rabbitmq ${RMQ_LIBRARIES}) +- ++ target_include_directories(rabbitmq PUBLIC $ $) + if (WIN32) + set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) + else (WIN32) diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index ac8e6f5cba5cec..fc4e75596f15f0 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-uwpwarning.patch + fix-usage-include-file.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/librabbitmq/vcpkg.json b/ports/librabbitmq/vcpkg.json index 9e8a333212428f..7aeebd72b0320d 100644 --- a/ports/librabbitmq/vcpkg.json +++ b/ports/librabbitmq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librabbitmq", "version": "0.11.0", - "port-version": 1, + "port-version": 2, "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.", "homepage": "https://github.com/alanxz/rabbitmq-c", "dependencies": [ From d4308db7bfc348525136defc7d5bdb3d1ecda755 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 14 Jun 2022 00:02:04 -0700 Subject: [PATCH 02/12] update version --- versions/baseline.json | 2 +- versions/l-/librabbitmq.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index bb54b660c8839e..67d2ff04ffb646 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3962,7 +3962,7 @@ }, "librabbitmq": { "baseline": "0.11.0", - "port-version": 1 + "port-version": 2 }, "libraqm": { "baseline": "0.9.0", diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index 1184cdf7905eb2..b3c8788ab88740 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0db0890485380a7506f9906acd74747ad918d27", + "version": "0.11.0", + "port-version": 2 + }, { "git-tree": "3131805ba3b7940db19df08d930a13d2fc1c707c", "version": "0.11.0", From bd02fb345a7ea42ecb53672ab2ffd916c3603013 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 14 Jun 2022 01:04:00 -0700 Subject: [PATCH 03/12] add license --- ports/librabbitmq/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/librabbitmq/vcpkg.json b/ports/librabbitmq/vcpkg.json index 7aeebd72b0320d..9824f012c27cef 100644 --- a/ports/librabbitmq/vcpkg.json +++ b/ports/librabbitmq/vcpkg.json @@ -4,6 +4,7 @@ "port-version": 2, "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", "dependencies": [ "openssl", { From 7514ce80f1d75585596381b49308d370b004e6e3 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 14 Jun 2022 01:04:26 -0700 Subject: [PATCH 04/12] overwrite version --- versions/l-/librabbitmq.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index b3c8788ab88740..5be5c46439c572 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e0db0890485380a7506f9906acd74747ad918d27", + "git-tree": "aae7bce2400828978444ceb1c36f3ed8f382de01", "version": "0.11.0", "port-version": 2 }, From c60cc02955fc70cef0b37b675e0ddd2c28d1eeaf Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 14 Jun 2022 19:37:21 -0700 Subject: [PATCH 05/12] update patch and options --- ports/librabbitmq/fix-usage-include-file.patch | 13 +++++++++++-- ports/librabbitmq/portfile.cmake | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/librabbitmq/fix-usage-include-file.patch b/ports/librabbitmq/fix-usage-include-file.patch index 778fa2d8b95ac0..ad4f4779bc5dee 100644 --- a/ports/librabbitmq/fix-usage-include-file.patch +++ b/ports/librabbitmq/fix-usage-include-file.patch @@ -1,5 +1,5 @@ diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt -index 671840b..fe5713b 100644 +index 671840b..7fcfa29 100644 --- a/librabbitmq/CMakeLists.txt +++ b/librabbitmq/CMakeLists.txt @@ -116,7 +116,7 @@ if (BUILD_SHARED_LIBS) @@ -7,7 +7,16 @@ index 671840b..fe5713b 100644 target_link_libraries(rabbitmq ${RMQ_LIBRARIES}) - -+ target_include_directories(rabbitmq PUBLIC $ $) ++ target_include_directories(rabbitmq PUBLIC $) if (WIN32) set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) else (WIN32) +@@ -136,7 +136,7 @@ if (BUILD_STATIC_LIBS) + add_library(rabbitmq-static STATIC ${RABBITMQ_SOURCES}) + + target_link_libraries(rabbitmq-static ${RMQ_LIBRARIES}) +- ++ target_include_directories(rabbitmq-static PUBLIC $) + set_target_properties(rabbitmq-static PROPERTIES COMPILE_DEFINITIONS AMQP_STATIC) + if (WIN32) + set_target_properties(rabbitmq-static PROPERTIES diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index fc4e75596f15f0..37a1cebfee9b6a 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -18,8 +18,11 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF + -DBUILD_SHARED_LIBS=${BUILD_SHARED} + -DBUILD_STATIC_LIBS=${BUILD_STATIC} ) + vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME rabbitmq-c CONFIG_PATH lib/cmake/rabbitmq-c) From 06f309432ab5f377d84dbb5a52f3b774f460275e Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 14 Jun 2022 19:39:42 -0700 Subject: [PATCH 06/12] update version --- versions/l-/librabbitmq.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index 5be5c46439c572..3c996bf878957f 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "aae7bce2400828978444ceb1c36f3ed8f382de01", + "git-tree": "50bf43049fd4ca8c518cfc7f8d4d368474889a81", "version": "0.11.0", "port-version": 2 }, From d809f06e4317b84103dc11e42e879193b440f845 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Thu, 16 Jun 2022 19:54:39 -0700 Subject: [PATCH 07/12] update patch --- .../librabbitmq/fix-usage-include-file.patch | 170 ++++++++++++++++-- ports/librabbitmq/portfile.cmake | 2 +- 2 files changed, 157 insertions(+), 15 deletions(-) diff --git a/ports/librabbitmq/fix-usage-include-file.patch b/ports/librabbitmq/fix-usage-include-file.patch index ad4f4779bc5dee..ca40b9795bab5c 100644 --- a/ports/librabbitmq/fix-usage-include-file.patch +++ b/ports/librabbitmq/fix-usage-include-file.patch @@ -1,22 +1,164 @@ diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt -index 671840b..7fcfa29 100644 +index 671840b..8fe6c94 100644 --- a/librabbitmq/CMakeLists.txt +++ b/librabbitmq/CMakeLists.txt -@@ -116,7 +116,7 @@ if (BUILD_SHARED_LIBS) - add_library(rabbitmq SHARED ${RABBITMQ_SOURCES}) +@@ -56,15 +56,15 @@ endif(MSVC) + # binary directory, and should shadow whats in the source directory + set(LIBRABBITMQ_INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} +- ${CMAKE_CURRENT_SOURCE_DIR} +- ${MSINTTYPES_INCLUDE} +- ) ++ ${CMAKE_CURRENT_SOURCE_DIR} ++ ${MSINTTYPES_INCLUDE} ++ ) + + include_directories(${LIBRABBITMQ_INCLUDE_DIRS}) + + set(LIBRABBITMQ_INCLUDE_DIRS +- ${LIBRABBITMQ_INCLUDE_DIRS} +- PARENT_SCOPE) ++ ${LIBRABBITMQ_INCLUDE_DIRS} ++ PARENT_SCOPE) + + add_definitions(-DHAVE_CONFIG_H) + +@@ -112,56 +112,102 @@ 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 ++ $ ++ $ ++ $ ++) ++ ++set(PRIVATE_INCLUDE_DIRS ++ ${CMAKE_CURRENT_BINARY_DIR} ++ ${SSL_INCLUDE_DIRS} ++) ++ ++set(LIBRABBITMQ_INCLUDE_DIRS ${PUBLIC_INCLUDE_DIRS} PARENT_SCOPE) ++ ++ + if (BUILD_SHARED_LIBS) +- add_library(rabbitmq SHARED ${RABBITMQ_SOURCES}) ++ ++ if (NOT APPLE) ++ set(CMAKE_INSTALL_RPATH $ORIGIN) ++ endif() ++ ++ add_library(rabbitmq SHARED ) ++ target_sources(rabbitmq PRIVATE ${RABBITMQ_SOURCES}) target_link_libraries(rabbitmq ${RMQ_LIBRARIES}) -- -+ target_include_directories(rabbitmq PUBLIC $) + ++ target_include_directories(rabbitmq ++ PUBLIC ${PUBLIC_INCLUDE_DIRS} ++ PRIVATE ${PRIVATE_INCLUDE_DIRS} ++ ) ++ ++ target_compile_definitions(rabbitmq PRIVATE -DHAVE_CONFIG_H) ++ ++ set_target_properties(rabbitmq PROPERTIES ++ VERSION ${RMQ_VERSION} ++ SOVERSION ${RMQ_SOVERSION} ++ ) if (WIN32) - set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) - else (WIN32) -@@ -136,7 +136,7 @@ if (BUILD_STATIC_LIBS) - add_library(rabbitmq-static STATIC ${RABBITMQ_SOURCES}) +- set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) +- else (WIN32) +- set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION}) +- endif (WIN32) ++ set_target_properties(rabbitmq PROPERTIES OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) ++ endif() - target_link_libraries(rabbitmq-static ${RMQ_LIBRARIES}) + install(TARGETS rabbitmq EXPORT "${targets_export_name}" +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ) - -+ target_include_directories(rabbitmq-static PUBLIC $) - set_target_properties(rabbitmq-static PROPERTIES COMPILE_DEFINITIONS AMQP_STATIC) - if (WIN32) - set_target_properties(rabbitmq-static PROPERTIES ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ COMPONENT rabbitmq-c-runtime ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ COMPONENT rabbitmq-c-runtime ++ NAMELINK_COMPONENT runtime-c-development ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ COMPONENT rabbitmq-c-development ++ ) + set(RMQ_LIBRARY_TARGET rabbitmq) +-endif (BUILD_SHARED_LIBS) ++endif() ++ + + if (BUILD_STATIC_LIBS) +- add_library(rabbitmq-static STATIC ${RABBITMQ_SOURCES}) ++ add_library(rabbitmq-static STATIC ) ++ target_sources(rabbitmq-static PRIVATE ${RABBITMQ_SOURCES}) + +- 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 +- VERSION ${RMQ_VERSION} +- OUTPUT_NAME librabbitmq.${RMQ_SOVERSION}) ++ target_compile_definitions(rabbitmq-static ++ PUBLIC -DAMQP_STATIC ++ PRIVATE -DHAVE_CONFIG_H ++ ) ++ ++ ++ target_link_libraries(rabbitmq-static PRIVATE ${RMQ_LIBRARIES}) + +- if(MSVC) +- set_target_properties(rabbitmq-static PROPERTIES +- # Embed debugging info in the library itself instead of generating +- # a .pdb file. +- COMPILE_OPTIONS "/Z7") +- endif(MSVC) ++ set_target_properties(rabbitmq-static PROPERTIES ++ VERSION ${RMQ_VERSION} ++ SOVERSION ${RMQ_SOVERSION}) + +- else (WIN32) +- set_target_properties(rabbitmq-static PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION} OUTPUT_NAME rabbitmq) +- endif (WIN32) ++ if (WIN32) ++ set_target_properties(rabbitmq-static PROPERTIES OUTPUT_NAME librabbitmq.${RMQ_SOVERSION}) ++ else() ++ set_target_properties(rabbitmq-static PROPERTIES OUTPUT_NAME rabbitmq) ++ endif() ++ ++ if(MSVC) ++ set_target_properties(rabbitmq-static PROPERTIES ++ # Embed debugging info in the library itself instead of generating ++ # a .pdb file. ++ COMPILE_OPTIONS "/Z7") ++ endif(MSVC) + + install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ COMPONENT rabbitmq-c-development + ) + + if (NOT DEFINED RMQ_LIBRARY_TARGET) + set(RMQ_LIBRARY_TARGET rabbitmq-static) + endif () +-endif (BUILD_STATIC_LIBS) ++endif () + + install(FILES + amqp.h +@@ -170,6 +216,7 @@ install(FILES + ${AMQP_SSL_SOCKET_H_PATH} + ${STDINT_H_INSTALL_FILE} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++ COMPONENT rabbitmq-c-development + ) + + set(RMQ_LIBRARY_TARGET ${RMQ_LIBRARY_TARGET} PARENT_SCOPE) diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index 37a1cebfee9b6a..87f4ceb7eedc88 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-uwpwarning.patch - fix-usage-include-file.patch + fix-usage-include-file.patch #Remove this patch in the next version ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) From d3ee87da2207bce80246cc5958e95db00249a824 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Thu, 16 Jun 2022 19:55:29 -0700 Subject: [PATCH 08/12] update version --- versions/l-/librabbitmq.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index 3c996bf878957f..c492a4ca350ded 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "50bf43049fd4ca8c518cfc7f8d4d368474889a81", + "git-tree": "5fcc4aec106adedf9c08e4a4e285624f1a8f0811", "version": "0.11.0", "port-version": 2 }, From a8c8df9a04573084af0d59ad2d3fff3c825e4880 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Fri, 17 Jun 2022 00:09:13 -0700 Subject: [PATCH 09/12] update patch --- ports/librabbitmq/fix-link-header-files.patch | 41 +++++ .../librabbitmq/fix-usage-include-file.patch | 164 ------------------ ports/librabbitmq/portfile.cmake | 4 +- 3 files changed, 42 insertions(+), 167 deletions(-) create mode 100644 ports/librabbitmq/fix-link-header-files.patch delete mode 100644 ports/librabbitmq/fix-usage-include-file.patch diff --git a/ports/librabbitmq/fix-link-header-files.patch b/ports/librabbitmq/fix-link-header-files.patch new file mode 100644 index 00000000000000..3590736cbb6a80 --- /dev/null +++ b/ports/librabbitmq/fix-link-header-files.patch @@ -0,0 +1,41 @@ +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 ++ $ ++ $ ++ $ ++) ++ ++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 diff --git a/ports/librabbitmq/fix-usage-include-file.patch b/ports/librabbitmq/fix-usage-include-file.patch deleted file mode 100644 index ca40b9795bab5c..00000000000000 --- a/ports/librabbitmq/fix-usage-include-file.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt -index 671840b..8fe6c94 100644 ---- a/librabbitmq/CMakeLists.txt -+++ b/librabbitmq/CMakeLists.txt -@@ -56,15 +56,15 @@ endif(MSVC) - # binary directory, and should shadow whats in the source directory - set(LIBRABBITMQ_INCLUDE_DIRS - ${CMAKE_CURRENT_BINARY_DIR} -- ${CMAKE_CURRENT_SOURCE_DIR} -- ${MSINTTYPES_INCLUDE} -- ) -+ ${CMAKE_CURRENT_SOURCE_DIR} -+ ${MSINTTYPES_INCLUDE} -+ ) - - include_directories(${LIBRABBITMQ_INCLUDE_DIRS}) - - set(LIBRABBITMQ_INCLUDE_DIRS -- ${LIBRABBITMQ_INCLUDE_DIRS} -- PARENT_SCOPE) -+ ${LIBRABBITMQ_INCLUDE_DIRS} -+ PARENT_SCOPE) - - add_definitions(-DHAVE_CONFIG_H) - -@@ -112,56 +112,102 @@ 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 -+ $ -+ $ -+ $ -+) -+ -+set(PRIVATE_INCLUDE_DIRS -+ ${CMAKE_CURRENT_BINARY_DIR} -+ ${SSL_INCLUDE_DIRS} -+) -+ -+set(LIBRABBITMQ_INCLUDE_DIRS ${PUBLIC_INCLUDE_DIRS} PARENT_SCOPE) -+ -+ - if (BUILD_SHARED_LIBS) -- add_library(rabbitmq SHARED ${RABBITMQ_SOURCES}) -+ -+ if (NOT APPLE) -+ set(CMAKE_INSTALL_RPATH $ORIGIN) -+ endif() -+ -+ add_library(rabbitmq SHARED ) -+ target_sources(rabbitmq PRIVATE ${RABBITMQ_SOURCES}) - - target_link_libraries(rabbitmq ${RMQ_LIBRARIES}) - -+ target_include_directories(rabbitmq -+ PUBLIC ${PUBLIC_INCLUDE_DIRS} -+ PRIVATE ${PRIVATE_INCLUDE_DIRS} -+ ) -+ -+ target_compile_definitions(rabbitmq PRIVATE -DHAVE_CONFIG_H) -+ -+ set_target_properties(rabbitmq PROPERTIES -+ VERSION ${RMQ_VERSION} -+ SOVERSION ${RMQ_SOVERSION} -+ ) - if (WIN32) -- set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) -- else (WIN32) -- set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION}) -- endif (WIN32) -+ set_target_properties(rabbitmq PROPERTIES OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) -+ endif() - - install(TARGETS rabbitmq EXPORT "${targets_export_name}" -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ) -- -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ COMPONENT rabbitmq-c-runtime -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ COMPONENT rabbitmq-c-runtime -+ NAMELINK_COMPONENT runtime-c-development -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ COMPONENT rabbitmq-c-development -+ ) - set(RMQ_LIBRARY_TARGET rabbitmq) --endif (BUILD_SHARED_LIBS) -+endif() -+ - - if (BUILD_STATIC_LIBS) -- add_library(rabbitmq-static STATIC ${RABBITMQ_SOURCES}) -+ add_library(rabbitmq-static STATIC ) -+ target_sources(rabbitmq-static PRIVATE ${RABBITMQ_SOURCES}) - -- 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 -- VERSION ${RMQ_VERSION} -- OUTPUT_NAME librabbitmq.${RMQ_SOVERSION}) -+ target_compile_definitions(rabbitmq-static -+ PUBLIC -DAMQP_STATIC -+ PRIVATE -DHAVE_CONFIG_H -+ ) -+ -+ -+ target_link_libraries(rabbitmq-static PRIVATE ${RMQ_LIBRARIES}) - -- if(MSVC) -- set_target_properties(rabbitmq-static PROPERTIES -- # Embed debugging info in the library itself instead of generating -- # a .pdb file. -- COMPILE_OPTIONS "/Z7") -- endif(MSVC) -+ set_target_properties(rabbitmq-static PROPERTIES -+ VERSION ${RMQ_VERSION} -+ SOVERSION ${RMQ_SOVERSION}) - -- else (WIN32) -- set_target_properties(rabbitmq-static PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION} OUTPUT_NAME rabbitmq) -- endif (WIN32) -+ if (WIN32) -+ set_target_properties(rabbitmq-static PROPERTIES OUTPUT_NAME librabbitmq.${RMQ_SOVERSION}) -+ else() -+ set_target_properties(rabbitmq-static PROPERTIES OUTPUT_NAME rabbitmq) -+ endif() -+ -+ if(MSVC) -+ set_target_properties(rabbitmq-static PROPERTIES -+ # Embed debugging info in the library itself instead of generating -+ # a .pdb file. -+ COMPILE_OPTIONS "/Z7") -+ endif(MSVC) - - install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ COMPONENT rabbitmq-c-development - ) - - if (NOT DEFINED RMQ_LIBRARY_TARGET) - set(RMQ_LIBRARY_TARGET rabbitmq-static) - endif () --endif (BUILD_STATIC_LIBS) -+endif () - - install(FILES - amqp.h -@@ -170,6 +216,7 @@ install(FILES - ${AMQP_SSL_SOCKET_H_PATH} - ${STDINT_H_INSTALL_FILE} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ COMPONENT rabbitmq-c-development - ) - - set(RMQ_LIBRARY_TARGET ${RMQ_LIBRARY_TARGET} PARENT_SCOPE) diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index 87f4ceb7eedc88..09c561d4509daf 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -6,11 +6,10 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-uwpwarning.patch - fix-usage-include-file.patch #Remove this patch in the next version + fix-link-header-files.patch #Remove this patch in the next version ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -18,7 +17,6 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF - -DBUILD_SHARED_LIBS=${BUILD_SHARED} -DBUILD_STATIC_LIBS=${BUILD_STATIC} ) From 6934d564c554eee19f45e33792181290a88aaa41 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Fri, 17 Jun 2022 00:09:47 -0700 Subject: [PATCH 10/12] update version --- versions/l-/librabbitmq.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index c492a4ca350ded..88654f664eb9a8 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5fcc4aec106adedf9c08e4a4e285624f1a8f0811", + "git-tree": "679bed94942c5b10be28af7838aa8306891129bd", "version": "0.11.0", "port-version": 2 }, From 15e3fdc27e7a458057a339d7ec129529c5f9bdff Mon Sep 17 00:00:00 2001 From: FrankXie Date: Fri, 17 Jun 2022 00:11:28 -0700 Subject: [PATCH 11/12] delete blank lines --- ports/librabbitmq/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index 09c561d4509daf..8ed28079f61903 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -20,7 +20,6 @@ vcpkg_cmake_configure( -DBUILD_STATIC_LIBS=${BUILD_STATIC} ) - vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME rabbitmq-c CONFIG_PATH lib/cmake/rabbitmq-c) From 3f0b57fdfae358691c394aa82fb12d6f1490e628 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Fri, 17 Jun 2022 00:12:10 -0700 Subject: [PATCH 12/12] overwrite version --- versions/l-/librabbitmq.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index 88654f664eb9a8..aed7f16772c7b1 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "679bed94942c5b10be28af7838aa8306891129bd", + "git-tree": "eaa23b49b84d0ec45e28645d78adc6c0b2f8faed", "version": "0.11.0", "port-version": 2 },