get rid of fmt
This commit is contained in:
parent
0c7f071b9d
commit
ab7b14f12e
4 changed files with 9 additions and 9 deletions
|
@ -1,6 +1,6 @@
|
||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
|
|
||||||
project(kima2 VERSION 1.8.0)
|
project(kima2 VERSION 1.8.1)
|
||||||
|
|
||||||
set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake")
|
set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake")
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ if( MINGW )
|
||||||
${MINGW_PATH}/libmd4c.dll
|
${MINGW_PATH}/libmd4c.dll
|
||||||
${MINGW_PATH}/libbrotlicommon.dll
|
${MINGW_PATH}/libbrotlicommon.dll
|
||||||
${MINGW_PATH}/libbrotlidec.dll
|
${MINGW_PATH}/libbrotlidec.dll
|
||||||
${MINGW_PATH}/libfmt.dll
|
#${MINGW_PATH}/libfmt.dll
|
||||||
${MINGW_PATH}/libb2-1.dll
|
${MINGW_PATH}/libb2-1.dll
|
||||||
${MINGW_PATH}/libiconv-2.dll)
|
${MINGW_PATH}/libiconv-2.dll)
|
||||||
install(FILES ${MINGW_PATH}/../share/qt6/plugins/platforms/qwindows.dll
|
install(FILES ${MINGW_PATH}/../share/qt6/plugins/platforms/qwindows.dll
|
||||||
|
|
|
@ -25,10 +25,10 @@ set(CORE_SOURCES
|
||||||
add_library(core STATIC ${CORE_SOURCES})
|
add_library(core STATIC ${CORE_SOURCES})
|
||||||
#target_include_directories(core PRIVATE ${PROJECT_SOURCE_DIR}/subprojects/csv-parser/single_include)
|
#target_include_directories(core PRIVATE ${PROJECT_SOURCE_DIR}/subprojects/csv-parser/single_include)
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json fmt::fmt)
|
target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json)
|
||||||
target_link_libraries(core PRIVATE bcrypt)
|
target_link_libraries(core PRIVATE bcrypt)
|
||||||
else()
|
else()
|
||||||
target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json fmt::fmt)
|
target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <fmt/chrono.h>
|
#include <format>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -47,7 +47,7 @@ void Database::newDb()
|
||||||
fs::path destPath = sourcePath.parent_path() / sourcePath.stem();
|
fs::path destPath = sourcePath.parent_path() / sourcePath.stem();
|
||||||
|
|
||||||
auto chronoTime = std::chrono::system_clock::now();
|
auto chronoTime = std::chrono::system_clock::now();
|
||||||
std::string timeString = fmt::format("{0:%FT%H-%M-%S}", chronoTime);
|
std::string timeString = std::format("{0:%FT%H-%M-%S}", chronoTime);
|
||||||
|
|
||||||
destPath += std::string("_") += timeString += ".db";
|
destPath += std::string("_") += timeString += ".db";
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <clocale>
|
#include <clocale>
|
||||||
#include <fmt/format.h>
|
#include <format>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
using namespace fmt;
|
//using namespace fmt;
|
||||||
|
|
||||||
std::string formatCentAsEuroString(const int cent, int width)
|
std::string formatCentAsEuroString(const int cent, int width)
|
||||||
{
|
{
|
||||||
|
@ -32,7 +32,7 @@ std::string formatCentAsEuroString(const int cent, int width)
|
||||||
#else
|
#else
|
||||||
std::locale myLocale{"de_DE.utf8"};
|
std::locale myLocale{"de_DE.utf8"};
|
||||||
#endif
|
#endif
|
||||||
return fmt::format(myLocale, "{:{}.2Lf} €", cent / 100.0L, width);
|
return std::format(myLocale, "{:{}.2Lf} €", cent / 100.0L, width);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string <rim(std::string &str, const std::string &chars)
|
std::string <rim(std::string &str, const std::string &chars)
|
||||||
|
|
Loading…
Reference in a new issue