diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2021-04-15 08:59:44 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2021-12-20 16:32:59 -0800 |
| commit | 26c7bc891468ffbdda3e9a045837fdbe43f1c98e (patch) | |
| tree | 5d929472567db5aa8be4aedf4b4d6542c467eb23 /cmake/modules | |
| parent | 8f73d3ed317e0035d265b947f9499f65e38854e8 (diff) | |
Revert "Revert "Merge pull request #18403 from lrusak/cpp17""
This reverts commit bd6818f1975ef4665d2319b482460f64aa4ae277.
This also includes a fix for the following:
CLog: fix SPDLOG_LEVEL_NAMES to allow compiling
Otherwise the following error occurs:
xbmc/utils/log.h:12:89: error: ‘constexpr fmt::v8::basic_string_view<Char>::basic_string_view(const Char*) [with Char = char]’ called in a constant expression
12 | #define SPDLOG_LEVEL_NAMES {"TRACE", "DEBUG", "INFO", "WARNING", "ERROR", "FATAL", "OFF"};
| ^
In file included from /usr/include/fmt/format.h:44,
from xbmc/utils/StringUtils.h:37,
from xbmc/utils/log.h:19,
/usr/include/fmt/core.h:460:3: note: ‘constexpr fmt::v8::basic_string_view<Char>::basic_string_view(const Char*) [with Char = char]’ is not usable as a ‘constexpr’ function because:
460 | basic_string_view(const Char* s) : data_(s) {
| ^~~~~~~~~~~~~~~~~
/usr/include/fmt/core.h:460:3: error: member ‘fmt::v8::basic_string_view<char>::size_’ must be initialized by mem-initializer in ‘constexpr’ constructor
/usr/include/fmt/core.h:439:10: note: declared here
439 | size_t size_;
| ^~~~~
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindLCMS2.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/modules/FindLCMS2.cmake b/cmake/modules/FindLCMS2.cmake index 7cc1497333..d02515815d 100644 --- a/cmake/modules/FindLCMS2.cmake +++ b/cmake/modules/FindLCMS2.cmake @@ -15,7 +15,7 @@ # LCMS2::LCMS2 - The LCMS Color Management library if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_LCMS2 lcms2 QUIET) + pkg_check_modules(PC_LCMS2 lcms2>=2.10 QUIET) endif() find_path(LCMS2_INCLUDE_DIR NAMES lcms2.h @@ -33,7 +33,7 @@ find_package_handle_standard_args(LCMS2 if(LCMS2_FOUND) set(LCMS2_LIBRARIES ${LCMS2_LIBRARY}) set(LCMS2_INCLUDE_DIRS ${LCMS2_INCLUDE_DIR}) - set(LCMS2_DEFINITIONS -DHAVE_LCMS2=1) + set(LCMS2_DEFINITIONS -DHAVE_LCMS2=1 -DCMS_NO_REGISTER_KEYWORD=1) if(NOT TARGET LCMS2::LCMS2) add_library(LCMS2::LCMS2 UNKNOWN IMPORTED) |