From ce56e5452d6d83b6a95d4de370dc5b5053b200d9 Mon Sep 17 00:00:00 2001 From: lukas-heiligenbrunner Date: Sun, 27 Oct 2019 14:14:03 +0100 Subject: [PATCH] improved cmake messages --- CMakeLists.txt | 31 +++++++++++++++++-------------- inc/IPRefresher.h | 3 +-- inc/Logger.h | 2 +- src/Logger.cpp | 3 ++- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ffc6e9..2b6820c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,16 +49,17 @@ else () set(SUFFIX "") endif () - +#config libs +message(STATUS "Config of Libraries") find_package(CURL REQUIRED) if (CURL_FOUND) message(STATUS "Found CURL version: ${CURL_VERSION_STRING}") message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}") message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}") - # include_directories(${CURL_INCLUDE_DIRS}) else () - message(FATAL_ERROR "Could not find CURLLL") + message(FATAL_ERROR "Could not find CURL") endif () +message("") include_directories(${CURL_INCLUDE_DIR} inc) #add version header @@ -98,6 +99,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/iprefresher.service DESTINATION /lib/s IF (UNIX) + message(STATUS "config of Package build") SET(CPACK_DEB_COMPONENT_INSTALL 1) SET(CPACK_OUTPUT_FILE_PREFIX packages) @@ -145,20 +147,21 @@ IF (UNIX) "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target package DEPENDS ${PROJECT_NAME} COMMENT "Installing ${PROJECT_NAME}") - +message("") ENDIF (UNIX) # check if Doxygen is installed -find_package(Doxygen) -if (DOXYGEN_FOUND) - if (BUILD_DOC) + +if (BUILD_DOC) + message(STATUS "config of DOxygen build") + find_package(Doxygen) + if (DOXYGEN_FOUND) # set input and output files set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in) set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) # request to configure the file configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY) - message(STATUS "Doxygen build started") # note the option ALL which allows to build the docs together with the application add_custom_target(doc_doxygen ALL @@ -166,10 +169,10 @@ if (DOXYGEN_FOUND) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating API documentation with Doxygen" VERBATIM) - else (BUILD_DOC) - message(STATUS "do not build docu") - endif (BUILD_DOC) + message(STATUS "Successfully configured doxygen") -else (DOXYGEN_FOUND) - message(STATUS "Doxygen need to be installed to generate the doxygen documentation") -endif (DOXYGEN_FOUND) \ No newline at end of file + else (DOXYGEN_FOUND) + message(STATUS "Doxygen need to be installed to generate the doxygen documentation") + endif (DOXYGEN_FOUND) + message("") +endif (BUILD_DOC) diff --git a/inc/IPRefresher.h b/inc/IPRefresher.h index 463d133..7dcaf9c 100644 --- a/inc/IPRefresher.h +++ b/inc/IPRefresher.h @@ -4,7 +4,6 @@ #pragma once - class IPRefresher { public: /** @@ -13,5 +12,5 @@ public: void checkIPAdress(bool force); IPRefresher(); - IPRefresher(bool loop); + explicit IPRefresher(bool loop); }; diff --git a/inc/Logger.h b/inc/Logger.h index 85080b1..2e8b042 100644 --- a/inc/Logger.h +++ b/inc/Logger.h @@ -13,7 +13,7 @@ public: static void warning(std::string message); static void error(std::string message); - static void log(std::string message, int level); + static void log(std::string &message, int level); static const int Debug; static const int Message; diff --git a/src/Logger.cpp b/src/Logger.cpp index dee9389..f47b37d 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -4,6 +4,7 @@ #include #include +#include #include "Logger.h" @@ -29,7 +30,7 @@ void Logger::error(std::string message) { log(message, Logger::Error); } -void Logger::log(std::string message, int level) { +void Logger::log(std::string &message, int level) { std::stringstream out; out << "["; switch (level) {