Skip to content

Commit 9198dff

Browse files
committed
Fix missing version variable
1 parent 93bdbd1 commit 9198dff

File tree

1 file changed

+24
-13
lines changed

1 file changed

+24
-13
lines changed

cmake/BxRabbitMQConfig.cmake.in

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# - Config file for the RabbitMQ package
22
# It defines the following variables
3+
# BxRabbitMQ_VERSION - BxRabbitMQ version
34
# BxRabbitMQ_INCLUDE_DIRS - include directories for Bayeux/RabbitMQ
45
# BxRabbitMQ_DEFINITIONS - compile definitions needed to use Bayeux/RabbitMQ
56
# BxRabbitMQ_LIBRARIES - libraries to link against
@@ -29,25 +30,35 @@
2930
get_filename_component (__bxrabbitmq_config_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
3031
message (STATUS "[info] BxRabbitMQConfig: in '${__bxrabbitmq_config_dir}'")
3132

33+
set (BxRabbitMQ_VERSION @BxRabbitMQ_VERSION@)
34+
mark_as_advanced (BxRabbitMQ_VERSION)
35+
3236
set (BxRabbitMQ_WITH_MANAGER @BxRabbitMQ_WITH_MANAGER@)
37+
mark_as_advanced (BxRabbitMQ_WITH_MANAGER)
38+
39+
#-----------------------------------------------------------------------
40+
set (BxRabbitMQ_DEFINITIONS -std=c++11)
41+
mark_as_advanced (BxRabbitMQ_DEFINITIONS)
42+
43+
message (STATUS "[info] BxRabbitMQConfig: BxRabbitMQ_DEFINITIONS = '${BxRabbitMQ_DEFINITIONS}'")
44+
if (CMAKE_COMPILER_IS_GNUCXX)
45+
set (CMAKE_CXX_FLAGS ${BxRabbitMQ_DEFINITIONS})
46+
endif ()
3347

3448
#-----------------------------------------------------------------------
3549
# Hard code paths to headers
3650
#
3751

3852
set (BxRabbitMQ_INCLUDE_DIR "${__bxrabbitmq_config_dir}/@BXRABBITMQ_CMAKEDIR_TO_INCLUDEDIR@")
53+
mark_as_advanced (BxRabbitMQ_INCLUDE_DIR)
54+
3955
set (BxRabbitMQ_LIB_DIR "${__bxrabbitmq_config_dir}/@BXRABBITMQ_CMAKEDIR_TO_LIBDIR@")
56+
mark_as_advanced (BxRabbitMQ_LIB_DIR)
4057

41-
mark_as_advanced (BxRabbitMQ_INCLUDE_DIR)
4258
set (BxRabbitMQ_INCLUDE_DIRS "${BxRabbitMQ_INCLUDE_DIR}" "${BxRabbitMQ_INCLUDE_DIR}/bayeux")
4359
message (STATUS "[info] BxRabbitMQConfig: BxRabbitMQ_INCLUDE_DIRS = '${BxRabbitMQ_INCLUDE_DIRS}'")
4460

4561
#-----------------------------------------------------------------------
46-
set (BxRabbitMQ_DEFINITIONS -std=c++11)
47-
message (STATUS "[info] BxRabbitMQConfig: BxRabbitMQ_DEFINITIONS = '${BxRabbitMQ_DEFINITIONS}'")
48-
if (CMAKE_COMPILER_IS_GNUCXX)
49-
set (CMAKE_CXX_FLAGS ${BxRabbitMQ_DEFINITIONS})
50-
endif ()
5162

5263
set (BxRabbitMQ_BOOST_VERSION @BxRabbitMQ_BOOST_VERSION@)
5364
set (Boost_NO_BOOST_CMAKE ON)
@@ -77,17 +88,17 @@ endif()
7788
list(FIND BxRabbitMQ_FIND_COMPONENTS "manager" _found_manager)
7889
if (BxRabbitMQ_WITH_MANAGER)
7990
list (APPEND BxRabbitMQ_INCLUDE_DIRS
80-
)
91+
)
8192
set (BxJsontools_DIR ${BxRabbitMQ_BXJSONTOOLS_DIR})
8293
message (STATUS "[info] BxRabbitMQConfig: Finding package BxJsontools...")
8394
find_package(BxJsontools ${BxRabbitMQ_BXJSONTOOLS_VERSION} EXACT REQUIRED CONFIG)
8495
list (APPEND BxRabbitMQ_INCLUDE_DIRS
85-
${BxRabbitMQ_BOOST_INCLUDE_DIRS}
86-
${BxRabbitMQ_CURLPP_INCLUDE_DIR}
87-
${BxJsontools_INCLUDE_DIRS}
88-
)
89-
# else()
90-
# message(FATAL_ERROR "[fatal] BxRabbitMQConfig: No support for BxRabbitMQ/manager!")
96+
${BxRabbitMQ_BOOST_INCLUDE_DIRS}
97+
${BxRabbitMQ_CURLPP_INCLUDE_DIR}
98+
${BxJsontools_INCLUDE_DIRS}
99+
)
100+
# else()
101+
# message(FATAL_ERROR "[fatal] BxRabbitMQConfig: No support for BxRabbitMQ/manager!")
91102
endif (BxRabbitMQ_WITH_MANAGER)
92103
if (NOT _found_manager EQUAL -1)
93104
set (BxRabbitMQ_FIND_REQUIRED_manager 1)

0 commit comments

Comments
 (0)