improved cmake messages
This commit is contained in:
parent
f642616bcf
commit
ce56e5452d
@ -49,16 +49,17 @@ else ()
|
|||||||
set(SUFFIX "")
|
set(SUFFIX "")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
#config libs
|
||||||
|
message(STATUS "Config of Libraries")
|
||||||
find_package(CURL REQUIRED)
|
find_package(CURL REQUIRED)
|
||||||
if (CURL_FOUND)
|
if (CURL_FOUND)
|
||||||
message(STATUS "Found CURL version: ${CURL_VERSION_STRING}")
|
message(STATUS "Found CURL version: ${CURL_VERSION_STRING}")
|
||||||
message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}")
|
message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}")
|
||||||
message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
|
message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
|
||||||
# include_directories(${CURL_INCLUDE_DIRS})
|
|
||||||
else ()
|
else ()
|
||||||
message(FATAL_ERROR "Could not find CURLLL")
|
message(FATAL_ERROR "Could not find CURL")
|
||||||
endif ()
|
endif ()
|
||||||
|
message("")
|
||||||
include_directories(${CURL_INCLUDE_DIR} inc)
|
include_directories(${CURL_INCLUDE_DIR} inc)
|
||||||
|
|
||||||
#add version header
|
#add version header
|
||||||
@ -98,6 +99,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/iprefresher.service DESTINATION /lib/s
|
|||||||
|
|
||||||
|
|
||||||
IF (UNIX)
|
IF (UNIX)
|
||||||
|
message(STATUS "config of Package build")
|
||||||
SET(CPACK_DEB_COMPONENT_INSTALL 1)
|
SET(CPACK_DEB_COMPONENT_INSTALL 1)
|
||||||
SET(CPACK_OUTPUT_FILE_PREFIX packages)
|
SET(CPACK_OUTPUT_FILE_PREFIX packages)
|
||||||
|
|
||||||
@ -145,20 +147,21 @@ IF (UNIX)
|
|||||||
"${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target package
|
"${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target package
|
||||||
DEPENDS ${PROJECT_NAME}
|
DEPENDS ${PROJECT_NAME}
|
||||||
COMMENT "Installing ${PROJECT_NAME}")
|
COMMENT "Installing ${PROJECT_NAME}")
|
||||||
|
message("")
|
||||||
ENDIF (UNIX)
|
ENDIF (UNIX)
|
||||||
|
|
||||||
# check if Doxygen is installed
|
# 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 input and output files
|
||||||
set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in)
|
set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in)
|
||||||
set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
|
set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
|
||||||
|
|
||||||
# request to configure the file
|
# request to configure the file
|
||||||
configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
|
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
|
# note the option ALL which allows to build the docs together with the application
|
||||||
add_custom_target(doc_doxygen ALL
|
add_custom_target(doc_doxygen ALL
|
||||||
@ -166,10 +169,10 @@ if (DOXYGEN_FOUND)
|
|||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||||
COMMENT "Generating API documentation with Doxygen"
|
COMMENT "Generating API documentation with Doxygen"
|
||||||
VERBATIM)
|
VERBATIM)
|
||||||
else (BUILD_DOC)
|
message(STATUS "Successfully configured doxygen")
|
||||||
message(STATUS "do not build docu")
|
|
||||||
endif (BUILD_DOC)
|
|
||||||
|
|
||||||
else (DOXYGEN_FOUND)
|
else (DOXYGEN_FOUND)
|
||||||
message(STATUS "Doxygen need to be installed to generate the doxygen documentation")
|
message(STATUS "Doxygen need to be installed to generate the doxygen documentation")
|
||||||
endif (DOXYGEN_FOUND)
|
endif (DOXYGEN_FOUND)
|
||||||
|
message("")
|
||||||
|
endif (BUILD_DOC)
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
|
||||||
class IPRefresher {
|
class IPRefresher {
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
@ -13,5 +12,5 @@ public:
|
|||||||
void checkIPAdress(bool force);
|
void checkIPAdress(bool force);
|
||||||
|
|
||||||
IPRefresher();
|
IPRefresher();
|
||||||
IPRefresher(bool loop);
|
explicit IPRefresher(bool loop);
|
||||||
};
|
};
|
||||||
|
@ -13,7 +13,7 @@ public:
|
|||||||
static void warning(std::string message);
|
static void warning(std::string message);
|
||||||
static void error(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 Debug;
|
||||||
static const int Message;
|
static const int Message;
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <libconfig.h>
|
||||||
|
|
||||||
#include "Logger.h"
|
#include "Logger.h"
|
||||||
|
|
||||||
@ -29,7 +30,7 @@ void Logger::error(std::string message) {
|
|||||||
log(message, Logger::Error);
|
log(message, Logger::Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Logger::log(std::string message, int level) {
|
void Logger::log(std::string &message, int level) {
|
||||||
std::stringstream out;
|
std::stringstream out;
|
||||||
out << "[";
|
out << "[";
|
||||||
switch (level) {
|
switch (level) {
|
||||||
|
Loading…
Reference in New Issue
Block a user