fix(cmake): protobuf dependencies are better now.

Still an issue with ninja but it works with make

CMakeLists.txt

@@ -58,13 +58,36 @@ endif ()
 
 set(protobuf_MODULE_COMPATIBLE True)
 
+find_package(asio REQUIRED)
+find_package(fmt REQUIRED)
+find_package(spdlog REQUIRED)
+find_package(OpenSSL REQUIRED)
+find_package(c-ares REQUIRED)
+find_package(ZLIB REQUIRED)
 find_package(nlohmann_json REQUIRED)
+find_package(Protobuf REQUIRED)
 find_package(gRPC REQUIRED)
 
+add_definitions(${spdlog_DEFINITIONS})
+
+include_directories(${nlohmann_json_INCLUDE_DIRS})
+include_directories(${fmt_INCLUDE_DIRS})
+include_directories(${spdlog_INCLUDE_DIRS})
+include_directories(${asio_INCLUDE_DIRS})
 include_directories(${protobuf_INCLUDE_DIRS})
+include_directories(${absl_INCLUDE_DIRS})
+include_directories(${gRPC_INCLUDE_DIRS})
+include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(${CMAKE_SOURCE_DIR})
 
+link_directories(${nlohmann_json_LIB_DIRS})
+link_directories(${fmt_LIB_DIRS})
+link_directories(${spdlog_LIB_DIRS})
 link_directories(${protobuf_LIB_DIRS})
+link_directories(${gRPC_LIB_DIRS})
+link_directories(${c-ares_LIB_DIRS})
+link_directories(${OpenSSL_LIB_DIRS})
+link_directories(${ZLIB_LIB_DIRS})
 
 set(PROTOBUF_PREFIX "${protobuf_LIB_DIRS}/..")
 

centreon-broker/CMakeLists.txt

@@ -77,33 +77,12 @@ add_custom_target(table_max_size DEPENDS ${INC_DIR}/database/table_max_size.hh)
 
 set_source_files_properties(${INC_DIR}/database/table_max_size.hh PROPERTIES GENERATED TRUE)
 
-find_package(fmt REQUIRED)
-find_package(spdlog REQUIRED)
-find_package(asio REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_package(c-ares REQUIRED)
-find_package(ZLIB REQUIRED)
 find_package(mariadb-connector-c REQUIRED)
 
 add_definitions(${spdlog_DEFINITIONS} ${mariadb-connector-c_DEFINITIONS})
 
-include_directories(${nlohmann_json_INCLUDE_DIRS})
-include_directories(${fmt_INCLUDE_DIRS})
-include_directories(${spdlog_INCLUDE_DIRS})
-include_directories(${asio_INCLUDE_DIRS})
-include_directories(${absl_INCLUDE_DIRS})
-include_directories(${gRPC_INCLUDE_DIRS})
-include_directories(${ZLIB_INCLUDE_DIRS})
-include_directories(${OpenSSL_INCLUDE_DIRS})
 include_directories(${mariadb-connector-c_INCLUDE_DIRS})
 
-link_directories(${nlohmann_json_LIB_DIRS})
-link_directories(${fmt_LIB_DIRS})
-link_directories(${spdlog_LIB_DIRS})
-link_directories(${gRPC_LIB_DIRS})
-link_directories(${c-ares_LIB_DIRS})
-link_directories(${OpenSSL_LIB_DIRS})
-link_directories(${ZLIB_LIB_DIRS})
 link_directories(${mariadb-connector-c_LIB_DIRS})
 
 message(STATUS "${PROTOBUF_PREFIX}/bin/protoc")
@@ -137,15 +116,12 @@ target_link_libraries(berpc ${protobuf_LIBS})
 set_target_properties(berpc PROPERTIES COMPILE_FLAGS "-fPIC")
 
 # Version.
-set(CENTREON_BROKER_MAJOR 21)
-set(CENTREON_BROKER_MINOR 10)
-set(CENTREON_BROKER_PATCH 0)
 if (CENTREON_BROKER_PRERELEASE)
-  set(CENTREON_BROKER_VERSION "${CENTREON_BROKER_MAJOR}.${CENTREON_BROKER_MINOR}.${CENTREON_BROKER_PATCH}-${CENTREON_BROKER_PRERELEASE}")
+  set(CENTREON_BROKER_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}-${CENTREON_BROKER_PRERELEASE}")
 else ()
-  set(CENTREON_BROKER_VERSION "${CENTREON_BROKER_MAJOR}.${CENTREON_BROKER_MINOR}.${CENTREON_BROKER_PATCH}")
+  set(CENTREON_BROKER_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
 endif ()
-add_definitions(-DCENTREON_BROKER_VERSION=\"${CENTREON_BROKER_VERSION}\" -DCENTREON_BROKER_PATCH=${CENTREON_BROKER_PATCH})
+add_definitions(-DCENTREON_BROKER_VERSION=\"${CENTREON_BROKER_VERSION}\" -DCENTREON_BROKER_PATCH=${COLLECT_PATCH})
 configure_file(
   ${INC_DIR}/version.hh.in
   ${INC_DIR}/version.hh

centreon-broker/cmake/package.cmake

@@ -31,9 +31,9 @@ if (WITH_PACKAGE_SH
     OR WITH_PACKAGE_NSIS)
   # Default settings.
   set(CPACK_PACKAGE_VENDOR "Centreon")
-  set(CPACK_PACKAGE_VERSION_MAJOR "${CENTREON_BROKER_MAJOR}")
-  set(CPACK_PACKAGE_VERSION_MINOR "${CENTREON_BROKER_MINOR}")
-  set(CPACK_PACKAGE_VERSION_PATCH "${CENTREON_BROKER_PATCH}")
+  set(CPACK_PACKAGE_VERSION_MAJOR "${COLLECT_MAJOR}")
+  set(CPACK_PACKAGE_VERSION_MINOR "${COLLECT_MINOR}")
+  set(CPACK_PACKAGE_VERSION_PATCH "${COLLECT_PATCH}")
   set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
     "Centreon Broker is a monitoring addon fully compatible with Nagios and Centreon Engine.")
   set(CPACK_PACKAGE_FILE_NAME

centreon-broker/cmake/tool.cmake

@@ -27,11 +27,3 @@ function(add_broker_module name activate)
   endif (WITH_MODULE_${name})
 endfunction(add_broker_module name activate)
 
-function(get_protobuf_files name)
-  set(proto_${name}
-      "${CMAKE_SOURCE_DIR}/protobuf/${name}.pb.cc"
-      "${CMAKE_SOURCE_DIR}/protobuf/${name}.pb.h"
-      PARENT_SCOPE)
-  set_source_files_properties("${CMAKE_SOURCE_DIR}/protobuf/${name}.pb.cc" PROPERTIES GENERATED TRUE)
-  set_source_files_properties("${CMAKE_SOURCE_DIR}/protobuf/${name}.pb.h" PROPERTIES GENERATED TRUE)
-endfunction()

centreon-broker/core/inc/com/centreon/broker/version.hh.in

@@ -15,9 +15,9 @@ CCB_BEGIN()
 
 namespace            version {
   // Compile-time values.
-  unsigned int const major = @CENTREON_BROKER_MAJOR@;
-  unsigned int const minor = @CENTREON_BROKER_MINOR@;
-  unsigned int const patch = @CENTREON_BROKER_PATCH@;
+  unsigned int const major = @COLLECT_MAJOR@;
+  unsigned int const minor = @COLLECT_MINOR@;
+  unsigned int const patch = @COLLECT_PATCH@;
   char const* const  string = "@CENTREON_BROKER_VERSION@";
 }
 

centreon-broker/neb/inc/com/centreon/clib/version.hh.in

@@ -20,9 +20,9 @@
 # define CC_CLIB_VERSION_HH
 
 // Compile-time values.
-# define CENTREON_CLIB_VERSION_MAJOR  @CLIB_MAJOR@
-# define CENTREON_CLIB_VERSION_MINOR  @CLIB_MINOR@
-# define CENTREON_CLIB_VERSION_PATCH  @CLIB_PATCH@
+# define CENTREON_CLIB_VERSION_MAJOR  @COLLECT_MAJOR@
+# define CENTREON_CLIB_VERSION_MINOR  @COLLECT_MINOR@
+# define CENTREON_CLIB_VERSION_PATCH  @COLLECT_PATCH@
 # define CENTREON_CLIB_VERSION_STRING "@CLIB_VERSION@"
 
 # include "com/centreon/namespace.hh"
@@ -32,16 +32,16 @@ CC_BEGIN()
 namespace              clib {
   namespace            version {
     // Compile-time values.
-    unsigned int const major = @CLIB_MAJOR@;
-    unsigned int const minor = @CLIB_MINOR@;
-    unsigned int const patch = @CLIB_PATCH@;
+    unsigned int const major = @COLLECT_MAJOR@;
+    unsigned int const minor = @COLLECT_MINOR@;
+    unsigned int const patch = @COLLECT_PATCH@;
     char const* const  string = "@CLIB_VERSION@";
 
     // Run-time values.
-    unsigned int       get_major() throw ();
-    unsigned int       get_minor() throw ();
-    unsigned int       get_patch() throw ();
-    char const*        get_string() throw ();
+    unsigned int       get_major() noexcept;
+    unsigned int       get_minor() noexcept;
+    unsigned int       get_patch() noexcept;
+    char const*        get_string() noexcept;
   }
 }
 

centreon-broker/neb/inc/com/centreon/engine/version.hh.in

@@ -21,9 +21,9 @@
 #define CCE_VERSION_HH
 
 // Compile-time values.
-#define CENTREON_ENGINE_VERSION_MAJOR @CENTREON_ENGINE_MAJOR@
-#define CENTREON_ENGINE_VERSION_MINOR @CENTREON_ENGINE_MINOR@
-#define CENTREON_ENGINE_VERSION_PATCH @CENTREON_ENGINE_PATCH@
+#define CENTREON_ENGINE_VERSION_MAJOR @COLLECT_MAJOR@
+#define CENTREON_ENGINE_VERSION_MINOR @COLLECT_MINOR@
+#define CENTREON_ENGINE_VERSION_PATCH @COLLECT_PATCH@
 #define CENTREON_ENGINE_VERSION_STRING "@CENTREON_ENGINE_VERSION@"
 
 #endif  // !CCE_VERSION_HH

centreon-broker/rrd/CMakeLists.txt

@@ -74,8 +74,8 @@ add_library("${RRD}" SHARED
   "${INC_DIR}/com/centreon/broker/rrd/lib.hh"
   "${INC_DIR}/com/centreon/broker/rrd/output.hh"
   )
+add_dependencies("${RRD}" ${proto_rebuild})
 set_target_properties("${RRD}" PROPERTIES PREFIX "")
-add_dependencies("${RRD}" "${STORAGE}")
 
 # Compile with librrd flags.
 if (LIBRRD_CFLAGS)

centreon-broker/storage/CMakeLists.txt

@@ -79,11 +79,11 @@ add_library("${STORAGE}" SHARED
   "${INC_DIR}/status.hh"
   "${INC_DIR}/stream.hh"
 )
+add_dependencies("${STORAGE}" ${proto_rebuild})
 set_target_properties("${STORAGE}" PROPERTIES
     PREFIX ""
     COMPILE_FLAGS "-fPIC")
 target_link_libraries(${STORAGE} conflictmgr)
-add_dependencies(${STORAGE} centreon_proto)
 
 # Testing.
 if (WITH_TESTING)

centreon-clib/CMakeLists.txt

@@ -1,5 +1,5 @@
 ##
-## Copyright 2011-2014,2018-2019 Centreon
+## Copyright 2011-2014,2018-2021 Centreon
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -32,10 +32,7 @@ set(SCRIPT_DIR "${PROJECT_SOURCE_DIR}/script")
 
 
 # Version.
-set(CLIB_MAJOR 21)
-set(CLIB_MINOR 10)
-set(CLIB_PATCH 0)
-set(CLIB_VERSION "${CLIB_MAJOR}.${CLIB_MINOR}.${CLIB_PATCH}")
+set(CLIB_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
 
 
 # Include module to check existing libraries.

centreon-clib/cmake/package.cmake

@@ -32,9 +32,9 @@ if (WITH_PACKAGE_SH
   # Default settings.
   set(CPACK_PACKAGE_NAME "centreon-clib")
   set(CPACK_PACKAGE_VENDOR "Centreon")
-  set(CPACK_PACKAGE_VERSION_MAJOR "${CLIB_MAJOR}")
-  set(CPACK_PACKAGE_VERSION_MINOR "${CLIB_MINOR}")
-  set(CPACK_PACKAGE_VERSION_PATCH "${CLIB_PATCH}")
+  set(CPACK_PACKAGE_VERSION_MAJOR "${COLLECT_MAJOR}")
+  set(CPACK_PACKAGE_VERSION_MINOR "${COLLECT_MINOR}")
+  set(CPACK_PACKAGE_VERSION_PATCH "${COLLECT_PATCH}")
   set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
     "Centreon C/C++ library used in multiple monitoring-related projects.")
   set(CPACK_PACKAGE_FILE_NAME

centreon-clib/inc/com/centreon/clib/version.hh.in

@@ -20,9 +20,9 @@
 # define CC_CLIB_VERSION_HH
 
 // Compile-time values.
-# define CENTREON_CLIB_VERSION_MAJOR  @CLIB_MAJOR@
-# define CENTREON_CLIB_VERSION_MINOR  @CLIB_MINOR@
-# define CENTREON_CLIB_VERSION_PATCH  @CLIB_PATCH@
+# define CENTREON_CLIB_VERSION_MAJOR  @COLLECT_MAJOR@
+# define CENTREON_CLIB_VERSION_MINOR  @COLLECT_MINOR@
+# define CENTREON_CLIB_VERSION_PATCH  @COLLECT_PATCH@
 # define CENTREON_CLIB_VERSION_STRING "@CLIB_VERSION@"
 
 # include "com/centreon/namespace.hh"
@@ -32,16 +32,16 @@ CC_BEGIN()
 namespace              clib {
   namespace            version {
     // Compile-time values.
-    unsigned int const major = @CLIB_MAJOR@;
-    unsigned int const minor = @CLIB_MINOR@;
-    unsigned int const patch = @CLIB_PATCH@;
+    unsigned int const major = @COLLECT_MAJOR@;
+    unsigned int const minor = @COLLECT_MINOR@;
+    unsigned int const patch = @COLLECT_PATCH@;
     char const* const  string = "@CLIB_VERSION@";
 
     // Run-time values.
-    unsigned int       get_major() throw ();
-    unsigned int       get_minor() throw ();
-    unsigned int       get_patch() throw ();
-    char const*        get_string() throw ();
+    unsigned int       get_major() noexcept;
+    unsigned int       get_minor() noexcept;
+    unsigned int       get_patch() noexcept;
+    char const*        get_string() noexcept;
   }
 }
 

centreon-connector/CMakeLists.txt

@@ -4,24 +4,14 @@ project(connectors CXX)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 add_definitions("-D_GLIBCXX_USE_CXX11_ABI=1")
 
-set(CONNECTOR_MAJOR 21)
-set(CONNECTOR_MINOR 10)
-set(CONNECTOR_PATCH 0)
-set(CONNECTOR_VERSION "${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}.${CONNECTOR_PATCH}")
+set(CONNECTOR_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
 add_definitions(-DCENTREON_CONNECTOR_VERSION=\"${CONNECTOR_VERSION}\")
 
 include(${PROJECT_SOURCE_DIR}/cmake/Findclib.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/FindSSH.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/Findperl.cmake)
 
 include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
-find_package(fmt REQUIRED)
-find_package(spdlog REQUIRED)
-
-add_definitions(${spdlog_DEFINITIONS})
-
-include_directories(${fmt_INCLUDE_DIRS})
-include_directories(${spdlog_INCLUDE_DIRS})
 
 # Generate code to dynamically load modules.
 

centreon-engine/CMakeLists.txt

@@ -49,35 +49,13 @@ include_directories("${INC_DIR}/compatibility")
 
 include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
 
-set(protobuf_MODULE_COMPATIBLE True)
-find_package(Protobuf REQUIRED)
-find_package(c-ares REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(fmt REQUIRED)
-find_package(spdlog REQUIRED)
-
-include_directories(${gRPC_INCLUDE_DIRS})
-include_directories(${absl_INCLUDE_DIRS})
-include_directories(${protobuf_INCLUDE_DIRS})
-include_directories(${nlohmann_json_INCLUDE_DIRS})
-include_directories(${fmt_INCLUDE_DIRS})
-
-link_directories(${protobuf_LIB_DIRS})
-link_directories(${gRPC_LIB_DIRS})
-link_directories(${OpenSSL_LIB_DIRS})
-link_directories(${c-ares_LIB_DIRS})
-link_directories(${ZLIB_LIB_DIRS})
-link_directories(${nlohmann_json_LIB_DIRS})
 link_directories(${CMAKE_SOURCE_DIR}/build/centreon-clib/)
 
 # Version.
-set(CENTREON_ENGINE_MAJOR 21)
-set(CENTREON_ENGINE_MINOR 10)
-set(CENTREON_ENGINE_PATCH 0)
 if (CENTREON_ENGINE_PRERELEASE)
-  set(CENTREON_ENGINE_VERSION "${CENTREON_ENGINE_MAJOR}.${CENTREON_ENGINE_MINOR}.${CENTREON_ENGINE_PATCH}-${CENTREON_ENGINE_PRERELEASE}")
+  set(CENTREON_ENGINE_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}-${CENTREON_ENGINE_PRERELEASE}")
 else ()
-  set(CENTREON_ENGINE_VERSION "${CENTREON_ENGINE_MAJOR}.${CENTREON_ENGINE_MINOR}.${CENTREON_ENGINE_PATCH}")
+  set(CENTREON_ENGINE_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
 endif()
 message(STATUS "Generating version header (${CENTREON_ENGINE_VERSION}).")
 configure_file("${INC_DIR}/com/centreon/engine/version.hh.in"

centreon-engine/cmake/package.cmake

@@ -32,9 +32,9 @@ if (WITH_PACKAGE_SH
     OR WITH_PACKAGE_NSIS)
   # Default settings.
   set(CPACK_PACKAGE_VENDOR "Merethis")
-  set(CPACK_PACKAGE_VERSION_MAJOR "${CENTREON_ENGINE_MAJOR}")
-  set(CPACK_PACKAGE_VERSION_MINOR "${CENTREON_ENGINE_MINOR}")
-  set(CPACK_PACKAGE_VERSION_PATCH "${CENTREON_ENGINE_PATCH}")
+  set(CPACK_PACKAGE_VERSION_MAJOR "${COLLECT_MAJOR}")
+  set(CPACK_PACKAGE_VERSION_MINOR "${COLLECT_MINOR}")
+  set(CPACK_PACKAGE_VERSION_PATCH "${COLLECT_PATCH}")
   set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
     "Centreon Engine is a monitoring engine fully Nagios-compatible but with additionnal features and performance improvements.")
   set(CPACK_PACKAGE_FILE_NAME

centreon-engine/inc/com/centreon/engine/version.hh.in

@@ -21,9 +21,9 @@
 #define CCE_VERSION_HH
 
 // Compile-time values.
-#define CENTREON_ENGINE_VERSION_MAJOR @CENTREON_ENGINE_MAJOR@
-#define CENTREON_ENGINE_VERSION_MINOR @CENTREON_ENGINE_MINOR@
-#define CENTREON_ENGINE_VERSION_PATCH @CENTREON_ENGINE_PATCH@
+#define CENTREON_ENGINE_VERSION_MAJOR @COLLECT_MAJOR@
+#define CENTREON_ENGINE_VERSION_MINOR @COLLECT_MINOR@
+#define CENTREON_ENGINE_VERSION_PATCH @COLLECT_PATCH@
 #define CENTREON_ENGINE_VERSION_STRING "@CENTREON_ENGINE_VERSION@"
 
 #endif  // !CCE_VERSION_HH

ci/scripts/collect-sources-delivery.sh

@@ -46,4 +46,4 @@ RELEASE=$RELEASE
 COMMIT=$COMMIT
 COMMITTER=$COMMITTER
 MAJOR=$MAJOR
-EOF
+EOF