From f0e19b0fb56afc261447d473aca8ecc65de6a13a Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 14 Aug 2024 13:31:12 +0200 Subject: [PATCH] Use vcpkg for fast-float and spdlog --- .gitmodules | 6 ------ ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp | 2 +- .../FileInterface/RifEclipseTextFileReader.cpp | 2 +- CMakeLists.txt | 7 ++++--- ThirdParty/fast_float | 1 - ThirdParty/spdlog | 1 - vcpkg.json | 4 +++- 7 files changed, 9 insertions(+), 14 deletions(-) delete mode 160000 ThirdParty/fast_float delete mode 160000 ThirdParty/spdlog diff --git a/.gitmodules b/.gitmodules index 03c750c207..90447290d1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "ThirdParty/vcpkg"] path = ThirdParty/vcpkg url = https://github.com/microsoft/vcpkg -[submodule "ThirdParty/fast_float"] - path = ThirdParty/fast_float - url = https://github.com/fastfloat/fast_float [submodule "ThirdParty/custom-opm-common/opm-common"] path = ThirdParty/custom-opm-common/opm-common url = https://github.com/CeetronSolutions/opm-common @@ -25,6 +22,3 @@ [submodule "ThirdParty/qtadvanceddocking"] path = ThirdParty/qtadvanceddocking url = https://github.com/CeetronSolutions/qtadvanceddocking.git -[submodule "ThirdParty/spdlog"] - path = ThirdParty/spdlog - url = https://github.com/gabime/spdlog.git diff --git a/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp b/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp index 35277b0230..0ae2ac76b5 100644 --- a/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp @@ -19,7 +19,7 @@ #include "RiaStdStringTools.h" #include "RiaLogging.h" -#include "fast_float/include/fast_float/fast_float.h" +#include "fast_float/fast_float.h" #include diff --git a/ApplicationLibCode/FileInterface/RifEclipseTextFileReader.cpp b/ApplicationLibCode/FileInterface/RifEclipseTextFileReader.cpp index 1c5f4d9ad9..fb31d6cb15 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseTextFileReader.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseTextFileReader.cpp @@ -20,7 +20,7 @@ #include "RifEclipseKeywordContent.h" // Utility class for fast conversion from string to float -#include "fast_float/include/fast_float/fast_float.h" +#include "fast_float/fast_float.h" // Utility class memory mapping of files #include "mio/mio.hpp" diff --git a/CMakeLists.txt b/CMakeLists.txt index f970c62e39..13f8c4bd00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -633,11 +633,12 @@ set_property( add_subdirectory(ThirdParty/tomlplusplus) # ############################################################################## -# spdlog +# spdlog and fast_float # ############################################################################## -add_subdirectory(ThirdParty/spdlog) -list(APPEND THIRD_PARTY_LIBRARIES spdlog) +find_package(FastFloat CONFIG REQUIRED) +find_package(spdlog CONFIG REQUIRED) +list(APPEND THIRD_PARTY_LIBRARIES FastFloat::fast_float spdlog::spdlog) # ############################################################################## # Arrow diff --git a/ThirdParty/fast_float b/ThirdParty/fast_float deleted file mode 160000 index 052975dd5f..0000000000 --- a/ThirdParty/fast_float +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 052975dd5f8166d0f9e4a215fa75a349d5985b91 diff --git a/ThirdParty/spdlog b/ThirdParty/spdlog deleted file mode 160000 index 8979f7fb2a..0000000000 --- a/ThirdParty/spdlog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8979f7fb2a119754e5fe7fe6d8155f67d934316a diff --git a/vcpkg.json b/vcpkg.json index 13c9ad3d43..c4f349ea5f 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -5,6 +5,8 @@ "boost-spirit", "eigen3", "grpc", - "type-lite" + "type-lite", + "fast-float", + "spdlog" ] }