Skip to content

[librabbitmq] Fix cannot include header file when using. #25224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 12 commits into from
Jun 17, 2022
Merged

[librabbitmq] Fix cannot include header file when using. #25224

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8e71b48
fix usage include files
Jun 14, 2022
d4308db
update version
Jun 14, 2022
bd02fb3
add license
Jun 14, 2022
7514ce8
overwrite version
Jun 14, 2022
c60cc02
update patch and options
Jun 15, 2022
06f3094
update version
Jun 15, 2022
d809f06
update patch
Jun 17, 2022
d3ee87d
update version
Jun 17, 2022
a8c8df9
update patch
Jun 17, 2022
6934d56
update version
Jun 17, 2022
15e3fdc
delete blank lines
Jun 17, 2022
3f0b57f
overwrite version
Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 164 additions & 0 deletions ports/librabbitmq/fix-usage-include-file.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
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}
+ )
Comment thread
FrankXie05 marked this conversation as resolved.
Outdated

include_directories(${LIBRABBITMQ_INCLUDE_DIRS})

set(LIBRABBITMQ_INCLUDE_DIRS
- ${LIBRABBITMQ_INCLUDE_DIRS}
- PARENT_SCOPE)
+ ${LIBRABBITMQ_INCLUDE_DIRS}
+ PARENT_SCOPE)
Comment thread
FrankXie05 marked this conversation as resolved.
Outdated

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
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:include>
+)
+
+set(PRIVATE_INCLUDE_DIRS
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${SSL_INCLUDE_DIRS}
+)
+
+set(LIBRABBITMQ_INCLUDE_DIRS ${PUBLIC_INCLUDE_DIRS} PARENT_SCOPE)
+
+
Comment thread
FrankXie05 marked this conversation as resolved.
Outdated
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)
4 changes: 4 additions & 0 deletions ports/librabbitmq/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-uwpwarning.patch
fix-usage-include-file.patch #Remove this patch in the next version
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
Expand All @@ -17,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)
Expand Down
3 changes: 2 additions & 1 deletion ports/librabbitmq/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"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",
"license": "MIT",
"dependencies": [
"openssl",
{
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3962,7 +3962,7 @@
},
"librabbitmq": {
"baseline": "0.11.0",
"port-version": 1
"port-version": 2
},
"libraqm": {
"baseline": "0.9.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/librabbitmq.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5fcc4aec106adedf9c08e4a4e285624f1a8f0811",
"version": "0.11.0",
"port-version": 2
},
{
"git-tree": "3131805ba3b7940db19df08d930a13d2fc1c707c",
"version": "0.11.0",
Expand Down