diff --git a/CMakeLists.txt b/CMakeLists.txt index d74482a..0c68801 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ 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") @@ -117,7 +117,7 @@ if( MINGW ) ${MINGW_PATH}/libmd4c.dll ${MINGW_PATH}/libbrotlicommon.dll ${MINGW_PATH}/libbrotlidec.dll - ${MINGW_PATH}/libfmt.dll + #${MINGW_PATH}/libfmt.dll ${MINGW_PATH}/libb2-1.dll ${MINGW_PATH}/libiconv-2.dll) install(FILES ${MINGW_PATH}/../share/qt6/plugins/platforms/qwindows.dll diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2e78044..402c687 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -25,10 +25,10 @@ set(CORE_SOURCES add_library(core STATIC ${CORE_SOURCES}) #target_include_directories(core PRIVATE ${PROJECT_SOURCE_DIR}/subprojects/csv-parser/single_include) 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) else() - target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json fmt::fmt) + target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json) endif() target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) diff --git a/src/core/database.cpp b/src/core/database.cpp index 863bc5d..d6b7384 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include @@ -47,7 +47,7 @@ void Database::newDb() fs::path destPath = sourcePath.parent_path() / sourcePath.stem(); 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"; diff --git a/src/core/utils.cpp b/src/core/utils.cpp index 1e4b9c6..1725924 100644 --- a/src/core/utils.cpp +++ b/src/core/utils.cpp @@ -2,13 +2,13 @@ #include #include -#include +#include #include #include #include -using namespace fmt; +//using namespace fmt; std::string formatCentAsEuroString(const int cent, int width) { @@ -32,7 +32,7 @@ std::string formatCentAsEuroString(const int cent, int width) #else std::locale myLocale{"de_DE.utf8"}; #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)