Revert "Merge branch 'develop' into MON-10917-sql-conection-uptime"

This reverts commit b9ec8c9, reversing
changes made to 2dde25a.

.gitignore

@@ -53,43 +53,43 @@ workspace.*
 
 src/config/centreon-engine/*.cfg
 
-**/.*.swp
+
+*.swp
 **/.idea/*
 **/.vscode/*
-**/CMakeFiles/*
-**/__pycache__/*
 **/build/*
-**/engine_pb2*.py
-*.swp
-.idea/*
-bbdo/*_accessor.hh
-build/*
-centreon-clib/inc/com/centreon/clib/version.hh
-centreon-clib/script/*
-centreon-connectors/perl/src/xs_init.cc
-centreon-connectors/perl/test/connector/paths.hh
-centreon-connectors/ssh/test/connector/binary.hh
-centreon-engine/benchmark/centreon-engine/*
-centreon-engine/benchmark/lib/*
-centreon-engine/benchmark/log/*
-centreon-engine/cmake-build-debug/*
 centreon-engine/conf/centengine.cfg
 centreon-engine/conf/objects/*.cfg
 centreon-engine/conf/resource.cfg
 centreon-engine/doc/_build
-centreon-engine/enginerpc/engine.*pb.cc
-centreon-engine/enginerpc/engine.*pb.h
-centreon-engine/gtest.cbp
 centreon-engine/inc/com/centreon/engine/version.hh
 centreon-engine/inc/compatibility/common.h
 centreon-engine/inc/compatibility/locations.h
-centreon-engine/modules/bench/passive/paths.hh
 centreon-engine/scripts/centengine.pc
 centreon-engine/scripts/centengine.sh
 centreon-engine/src/simumod/neb.cc
 centreon-engine/tags
-ci/repo/*
+centreon-engine/gtest.cbp
+**/CMakeFiles/*
+centreon-engine/cmake-build-debug/*
+centreon-engine/modules/bench/passive/paths.hh
+centreon-engine/enginerpc/engine.*pb.cc
+centreon-engine/enginerpc/engine.*pb.h
+**/__pycache__/*
+**/engine_pb2*.py
+centreon-engine/benchmark/centreon-engine/*
+centreon-engine/benchmark/log/*
+centreon-engine/benchmark/lib/*
+**/.*.swp
+centreon-connectors/perl/src/xs_init.cc
+centreon-connectors/perl/test/connector/paths.hh
+centreon-connectors/ssh/test/connector/binary.hh
+build/*
+.idea/*
 cmake-build-debug/*
-log.html
+centreon-clib/script/*
+centreon-clib/inc/com/centreon/clib/version.hh
 output.xml
+log.html
 report.html
+ci/repo/*

CMakeLists.txt

@@ -20,24 +20,15 @@
 # Global settings.
 #
 
-
 # Set necessary settings.
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 2.8)
 project("Centreon Collect" C CXX)
 if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   message(FATAL_ERROR "You can build broker with g++ or clang++. CMake will exit.")
 endif ()
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++")
-#set(CMAKE_CXX_COMPILER "clang++")
-add_definitions("-D_GLIBCXX_USE_CXX11_ABI=1")
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 set(ALLOW_DUPLICATE_EXECUTABLE TRUE)
-
-set(BUILD_ARGS "-w" "dupbuild=warn")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 # set -latomic if OS is Raspbian.
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
@@ -58,51 +49,6 @@ set(USER_BROKER centreon-broker)
 set(USER_ENGINE centreon-engine)
 ##################################
 
-include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
-include(GNUInstallDirs)
-
-set(CMAKE_INSTALL_PREFIX "/usr")
-option(WITH_TESTING "Build unit tests." OFF)
-if (WITH_TESTING)
-  find_package(GTest REQUIRED)
-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}/..")
-
-add_subdirectory(bbdo)
 add_subdirectory(centreon-broker)
 add_subdirectory(centreon-clib)
 add_subdirectory(centreon-engine)

README.md

@@ -116,8 +116,8 @@ You'll need to download the project and launch the *cmake.sh* script
 to prepare the compilation environment:
 
 ```shell
-git clone https://github.com/centreon/centreon-collect
-cd centreon-collect
+git clone https://github.com/centreon/centreon-Collect
+cd centreon-Collect
 ./cmake.sh
 ```
 
@@ -163,11 +163,11 @@ pip3 install conan
 You can now prepare the compilation environment:
 
 ```shell
-git clone https://github.com/centreon/centreon-collect
-mkdir -p centreon-collect/build
-cd centreon-collect/build
+git clone https://github.com/centreon/centreon-Collect
+mkdir -p centreon-Collect/build
+cd centreon-Collect/build
 conan install .. --build=missing
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TESTING=On -DWITH_MODULE_SIMU=On ..
+cmake -DWITH_CENTREON_CLIB_INCLUDE_DIR=../centreon-clib/inc/ -DWITH_CENTREON_CLIB_LIBRARIES=centreon-clib/libcentreon_clib.so -DCMAKE_BUILD_TYPE=Release -DWITH_PREFIX=/usr -DWITH_PREFIX_BIN=/usr/sbin -DWITH_USER_BROKER=centreon-broker -DWITH_USER_ENGINE=centreon-engine -DWITH_GROUP_BROKER=centreon-broker -DWITH_GROUP_ENGINE=centreon-engine -DWITH_TESTING=On -DWITH_PREFIX_MODULES=/usr/share/centreon/lib/centreon-broker -DWITH_PREFIX_CONF_BROKER=/etc/centreon-broker -DWITH_PREFIX_LIB_BROKER=/usr/lib64/nagios -DWITH_PREFIX_CONF_ENGINE=/etc/centreon-engine -DWITH_PREFIX_LIB_ENGINE=/usr/lib64/centreon-engine -DWITH_PREFIX_LIB_CLIB=/usr/lib/ -DWITH_RW_DIR=/var/lib/centreon-engine/rw -DWITH_VAR_DIR=/var/log/centreon-engine -DWITH_MODULE_SIMU=On ..
 
 ```
 
@@ -195,7 +195,7 @@ You're done!
 ## Bug reports / Feature requests
 
 The best way to report a bug or to request a feature is to open an issue
-in GitHub's [issue tracker](https://github.com/centreon/centreon-collect/issues/).
+in GitHub's [issue tracker](https://github.com/centreon/centreon-Collect/issues/).
 
 Please note that Centreon Collect follows the
 [same workflow as Centreon](https://github.com/centreon/centreon/issues/new/choose)