ソースを参照

cmake: Quiet fail for rabbit-mq

- Remove extra find_package(pkgconfig)
- Remove required version
Xenofon Karamanos 3 ヶ月 前
コミット
1c4de2410f
2 ファイル変更4 行追加3 行削除
  1. 2 2
      src/modules/kazoo/CMakeLists.txt
  2. 2 1
      src/modules/rabbitmq/CMakeLists.txt

+ 2 - 2
src/modules/kazoo/CMakeLists.txt

@@ -18,7 +18,8 @@ pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
 add_library(json-c::json-c ALIAS PkgConfig::json-c)
 # endif()
 
-find_package(rabbitmq-c 0.13)
+# rabbitmq provides cmake support for versions 0.13 and above.
+find_package(rabbitmq-c QUIET)
 if(NOT rabbitmq-c_FOUND)
   message(STATUS "rabbitmq-c not found. looking with pkg-config")
   find_package(PkgConfig REQUIRED)
@@ -26,7 +27,6 @@ if(NOT rabbitmq-c_FOUND)
   add_library(rabbitmq::rabbitmq ALIAS PkgConfig::rabbitmq-c)
 endif()
 
-find_package(PkgConfig REQUIRED)
 pkg_check_modules(UUID REQUIRED IMPORTED_TARGET uuid)
 add_library(uuid::uuid ALIAS PkgConfig::UUID)
 

+ 2 - 1
src/modules/rabbitmq/CMakeLists.txt

@@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c")
 
 add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-find_package(rabbitmq-c 0.13 QUIET)
+# rabbitmq provides cmake support for versions 0.13 and above.
+find_package(rabbitmq-c QUIET)
 if(NOT rabbitmq-c_FOUND)
   message(STATUS "rabbitmq-c not found. looking with pkg-config")
   find_package(PkgConfig REQUIRED)