diff --git a/CMakeLists.txt b/CMakeLists.txt index 9771bb885..868e66687 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,10 @@ -cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) + +# CMP0075 Include file check macros honor CMAKE_REQUIRED_LIBRARIES +# For more information see: https://cmake.org/cmake/help/latest/policy/CMP0075.html +if(POLICY CMP0075) + cmake_policy(SET CMP0075 NEW) +endif() file(STRINGS "VERSION" VERSION) @@ -19,7 +25,8 @@ execute_process(COMMAND echo -n ${VERSION} execute_process(COMMAND git describe --always OUTPUT_VARIABLE REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) if(NOT REVISION) execute_process(COMMAND date +p%Y%m%d OUTPUT_VARIABLE REVISION diff --git a/src/lib/ebus/datatype.cpp b/src/lib/ebus/datatype.cpp index f2d5b8fd5..7a3424c9d 100755 --- a/src/lib/ebus/datatype.cpp +++ b/src/lib/ebus/datatype.cpp @@ -68,8 +68,7 @@ bool DataType::dump(OutputFormat outputFormat, size_t length, bool appendDivisor } -result_t StringDataType::readRawValue(size_t offset, size_t length, const SymbolString& input, - unsigned int* value) const { +result_t StringDataType::readRawValue(size_t, size_t, const SymbolString&, unsigned int*) const { return RESULT_EMPTY; } @@ -204,8 +203,7 @@ result_t StringDataType::writeSymbols(size_t offset, size_t length, istringstrea } -result_t DateTimeDataType::readRawValue(size_t offset, size_t length, const SymbolString& input, - unsigned int* value) const { +result_t DateTimeDataType::readRawValue(size_t, size_t, const SymbolString&, unsigned int*) const { return RESULT_EMPTY; } @@ -353,7 +351,7 @@ result_t DateTimeDataType::readSymbols(size_t offset, size_t length, const Symbo } *output << dec << setfill('0') << setw(2) << static_cast(d) << "." << setw(2) << static_cast(m) << "." << static_cast(y + 1900); - m = (int)(minutes%(24*60)); + m = static_cast(minutes%(24*60)); d = m/60; *output << " " << setw(2) << dec << setfill('0') << static_cast(d); m -= d*60; diff --git a/src/tools/ebuspicloader.cpp b/src/tools/ebuspicloader.cpp index 86773dbe4..104d854f4 100644 --- a/src/tools/ebuspicloader.cpp +++ b/src/tools/ebuspicloader.cpp @@ -904,7 +904,7 @@ int main(int argc, char* argv[]) { printFileChecksum(); exit(EXIT_SUCCESS); } else { - argp_help(&aargp, stderr, ARGP_HELP_STD_ERR, "ebuspicloader"); + argp_help(&aargp, stderr, ARGP_HELP_STD_ERR, const_cast("ebuspicloader")); exit(EXIT_FAILURE); } }