Skip to content

Commit f9440a1

Browse files
committed
Fix CMake config script
1 parent a5d65b1 commit f9440a1

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ file(RELATIVE_PATH BXRABBITMQ_CMAKEDIR_TO_INCLUDEDIR
6767
"${CMAKE_INSTALL_FULL_CMAKEDIR}/${BXRABBITMQ_TAG}"
6868
"${CMAKE_INSTALL_FULL_INCLUDEDIR}"
6969
)
70+
file(RELATIVE_PATH BXRABBITMQ_CMAKEDIR_TO_LIBDIR
71+
"${CMAKE_INSTALL_FULL_CMAKEDIR}/${BXRABBITMQ_TAG}"
72+
"${CMAKE_INSTALL_FULL_LIBDIR}"
73+
)
7074

7175
# - Option: RabbitMQ server management implies cURLpp and BxJsontools:
7276
option(BXRABBITMQ_WITH_MANAGER "Build RabbitMQ server management code" OFF)

cmake/BxRabbitMQConfig.cmake.in

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ set (BxRabbitMQ_WITH_MANAGER @BxRabbitMQ_WITH_MANAGER@)
3636
#
3737

3838
set (BxRabbitMQ_INCLUDE_DIR "${__bxrabbitmq_config_dir}/@BXRABBITMQ_CMAKEDIR_TO_INCLUDEDIR@")
39+
set (BxRabbitMQ_LIB_DIR "${__bxrabbitmq_config_dir}/@BXRABBITMQ_CMAKEDIR_TO_LIBDIR@")
3940

4041
mark_as_advanced (BxRabbitMQ_INCLUDE_DIR)
4142
set (BxRabbitMQ_INCLUDE_DIRS "${BxRabbitMQ_INCLUDE_DIR}" "${BxRabbitMQ_INCLUDE_DIR}/bayeux")
@@ -104,7 +105,9 @@ if (NOT BxRabbitMQ_TARGETS_LOADED)
104105
endif ()
105106

106107
# - RabbitMQ itself
107-
set (BxRabbitMQ_LIBRARY Bayeux_rabbitmq CACHE FILE "BxRabbitMQ library (imported)")
108+
set (BxRabbitMQ_LIBRARY
109+
"${BxRabbitMQ_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Bayeux_rabbitmq${CMAKE_SHARED_LIBRARY_SUFFIX}"
110+
CACHE FILE "BxRabbitMQ library (imported)")
108111
set (BxRabbitMQ_LIBRARIES ${BxRabbitMQ_LIBRARY})
109112
list (APPEND BxRabbitMQ_LIBRARIES
110113
${BxRabbitMQ_RABBITC_LIBRARY}
@@ -115,7 +118,9 @@ message (STATUS "[info] BxRabbitMQConfig: BxRabbitMQ_LIBRARIES = '${BxRabbitMQ_L
115118

116119
if (BxRabbitMQ_WITH_MANAGER)
117120

118-
set (BxRabbitMQ_MANAGER_LIBRARY Bayeux_rabbitmq_manager CACHE FILE "BxRabbitMQ manager library (imported)")
121+
set (BxRabbitMQ_MANAGER_LIBRARY
122+
"${BxRabbitMQ_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Bayeux_rabbitmq_manager${CMAKE_SHARED_LIBRARY_SUFFIX}"
123+
CACHE FILE "BxRabbitMQ manager library (imported)")
119124
set (BxRabbitMQ_MANAGER_LIBRARIES ${BxRabbitMQ_MANAGER_LIBRARY})
120125
if (BxRabbitMQ_FIND_REQUIRED_manager)
121126
list (APPEND BxRabbitMQ_MANAGER_LIBRARIES

0 commit comments

Comments
 (0)